Merge pull request #135 from marienz/main

Omit symlinks to avoid a file collision
nix-community · Dec 26, 2024 · 89188f9 · 89188f9
2 parents 02dadae + 0a961f6
commit 89188f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/comma-wrapper.nix b/comma-wrapper.nix
@@ -1,5 +1,5 @@
 {
-  lib,
+  linkFarm,
   symlinkJoin,
   makeBinaryWrapper,
   comma,
@@ -13,13 +13,11 @@ symlinkJoin {
   name = "comma-with-db-${comma.version}";
   paths = [ commaOverridden ];
   nativeBuildInputs = [ makeBinaryWrapper ];
+  databaseDirectory = linkFarm "nix-index-database" { files = nix-index-database; };
   postBuild = ''
-    mkdir -p $out/share/cache/nix-index
-    ln -s ${nix-index-database} $out/share/cache/nix-index/files
-
     for cmd in "," "comma"; do
       wrapProgram "$out/bin/$cmd" \
-        --set NIX_INDEX_DATABASE $out/share/cache/nix-index
+        --set NIX_INDEX_DATABASE $databaseDirectory
     done
   '';
 

diff --git a/nix-index-wrapper.nix b/nix-index-wrapper.nix
@@ -1,4 +1,5 @@
 {
+  linkFarm,
   symlinkJoin,
   makeBinaryWrapper,
   nix-index-unwrapped,
@@ -9,12 +10,10 @@ symlinkJoin {
   name = "nix-index-with-${db-type}-db-${nix-index-unwrapped.version}";
   paths = [ nix-index-unwrapped ];
   nativeBuildInputs = [ makeBinaryWrapper ];
+  databaseDirectory = linkFarm "nix-index-database" { files = nix-index-database; };
   postBuild = ''
-    mkdir -p $out/share/cache/nix-index
-    ln -s ${nix-index-database} $out/share/cache/nix-index/files
-
     wrapProgram $out/bin/nix-locate \
-      --set NIX_INDEX_DATABASE $out/share/cache/nix-index
+      --set NIX_INDEX_DATABASE $databaseDirectory
 
     mkdir -p $out/etc/profile.d
     rm -f "$out/etc/profile.d/command-not-found.sh"