2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 5493cdb3faf6..15b51631b33b 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -17,17 +17,12 @@ let
 
   env = buildEnv {
     name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
+
     paths = pkgs;
+    pathsToLink = [ "/" "/hack" ];
     ignoreCollisions = true;
+
     postBuild = lib.optionalString enableDFHack ''
-      # #4621
-      if [ -L "$out/hack" ]; then
-        rm $out/hack
-        mkdir $out/hack
-        for i in ${dfhack}/hack/*; do
-          ln -s $i $out/hack
-        done
-      fi
       rm $out/hack/symbols.xml
       substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \
         --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
index d53769ca4b61..c8d8d287403b 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
@@ -8,4 +8,4 @@ done
 
 cd "$DF_DIR"
 LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \
-  LD_PRELOAD=$env_dir/hack/libdfhack.so exec $env_dir/libs/Dwarf_Fortress "$@"
+  LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@"