Merge "package: don't run shellHook in nested nix-shells" into main

2024-05-28 10:01:37 +00:00
parent 0b91a4b0ec 7a12bc2007
commit 71b32bb87c
1 changed files with 7 additions and 0 deletions
@@ -414,6 +414,8 @@ stdenv.mkDerivation (finalAttrs: {
        glibcFix
        // {

+          name = "lix-shell-env";
+
          inputsFrom = [ finalAttrs ];

          # For Meson to find Boost.
@@ -437,6 +439,11 @@ stdenv.mkDerivation (finalAttrs: {
            ++ finalAttrs.checkInputs;

          shellHook = ''
+            # don't re-run the hook in (other) nested nix-shells
+            if [[ $name != lix-shell-env ]]; then
+              return;
+            fi
+
            PATH=$prefix/bin:$PATH
            unset PYTHONPATH
            export MANPATH=$out/share/man:$MANPATH