Merge #264

264: Revert to manual quoting to make sure env variables can be used as part of other env variables when prefixing r=zimbatm a=chvp



Co-authored-by: Charlotte Van Petegem <[email protected]>

modules/env.nix

@@ -64,7 +64,7 @@ let
     else if valType == "eval" then
       "export ${name}=${eval}"
     else if valType == "prefix" then
-      ''export ${name}=$(${pkgs.coreutils}/bin/realpath --canonicalize-missing ${escapeShellArg prefix})''${${name}+:''${${name}}}''
+      ''export ${name}=$(${pkgs.coreutils}/bin/realpath --canonicalize-missing "${prefix}")''${${name}+:''${${name}}}''
     else if valType == "unset" then
       ''unset ${name}''
     else

tests/extra/language.c.nix

@@ -16,4 +16,20 @@
       # Has a C compiler
       type -p clang
     '';
+  # Test good LD_LIBRARY_PATH value
+  language-c-2 =
+    let
+      shell = devshell.mkShell {
+        imports = [ ../../extra/language/c.nix ];
+        devshell.name = "devshell-2";
+        language.c.libraries = [ pkgs.openssl ];
+      };
+    in
+    runTest "language-c-2" { } ''
+      # Load the devshell
+      source ${shell}/env.bash
+
+      # LD_LIBRARY_PATH is evaluated correctly
+      [[ ! "$LD_LIBRARY_PATH" =~ "DEVSHELL_DIR" ]]
+    '';
 }