Compare commits

..

No commits in common. "d5637ee790799ffa00bcaa3067bb6940b6cbad16" and "d86009bd76ae85e56e1d26aab26d38f90ecb6439" have entirely different histories.

3 changed files with 3 additions and 9 deletions

View file

@ -1 +0,0 @@
This is a file used by the dev shell shellHook in package.nix to check that this is actually a Lix repo before installing git hooks. Its contents have no meaning.

View file

@ -9,8 +9,8 @@ clean:
rm -rf build
# Prepare meson for building
setup *OPTIONS:
meson setup build --prefix="$PWD/outputs/out" $mesonFlags {{ OPTIONS }}
setup:
meson setup build --prefix="$PWD/outputs/out" $mesonFlags
# Build lix
build *OPTIONS:

View file

@ -476,7 +476,7 @@ stdenv.mkDerivation (finalAttrs: {
# https://git.lix.systems/lix-project/lix/src/commit/7575db522e9008685c4009423398f6900a16bcce/src/nix/develop.cc#L240-L241
# this is, of course, absurd.
if [[ $name != lix-shell-env && $name != lix-shell-env-env ]]; then
return
return;
fi
PATH=$prefix/bin:$PATH
@ -486,11 +486,6 @@ stdenv.mkDerivation (finalAttrs: {
# Make bash completion work.
XDG_DATA_DIRS+=:$out/share
if [[ ! -f ./.this-is-lix ]]; then
echo "Dev shell not started from inside a Lix repo, skipping repo setup" >&2
return
fi
${lib.optionalString (pre-commit-checks ? shellHook) pre-commit-checks.shellHook}
# Allow `touch .nocontribmsg` to turn this notice off.
if ! [[ -f .nocontribmsg ]]; then