dwarf-fortress.dfhack: enable 64-bit build, fix segfault

2016-11-24 03:10:43 +03:00
parent 79ea04c6c7
commit 714cf7803c
6 changed files with 37 additions and 130 deletions
@@ -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) \