Handle the case where a parent of ~/.nix-defexpr is a symlink

Fixes DeterminateSystems/nix-installer#912 and probably NixOS#10247.
edolstra · Apr 3, 2024 · 09551fa · 09551fa
1 parent 5536788
commit 09551fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
@@ -109,7 +109,7 @@ static void getAllExprs(EvalState & state,
  const SourcePath & path, StringSet & seen, BindingsBuilder & attrs)
 {
  StringSet namesSorted;
- for (auto & [name, _] : path.readDirectory()) namesSorted.insert(name);
+ for (auto & [name, _] : path.resolveSymlinks().readDirectory()) namesSorted.insert(name);
 
  for (auto & i : namesSorted) {
  /* Ignore the manifest.nix used by profiles. This is

diff --git a/tests/functional/user-envs.sh b/tests/functional/user-envs.sh
@@ -189,3 +189,9 @@ nix-env --set $outPath10
 [ "$(nix-store -q --resolve $profiles/test)" = $outPath10 ]
 nix-env --set $drvPath10
 [ "$(nix-store -q --resolve $profiles/test)" = $outPath10 ]
+
+# Test the case where $HOME contains a symlink.
+mkdir -p $TEST_ROOT/real-home/alice/.nix-defexpr/channels
+ln -sfn $TEST_ROOT/real-home $TEST_ROOT/home
+ln -sfn $(pwd)/user-envs.nix $TEST_ROOT/home/alice/.nix-defexpr/channels/foo
+HOME=$TEST_ROOT/home/alice nix-env -i foo-0.1