public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwarf-fortress: cleanup

Browse Source
This commit is contained in:
Matthew Bauer
2018-07-02 11:59:36 -04:00
parent 8d5b5fa68e
commit dcea211084
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/dwarf-fortress/wrapper/default.nix
+2 -9
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, buildEnv, dwarf-fortress-original, dwarf-fortress-unfuck, substituteAll
{ stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
, enableDFHack ? false, dfhack
, enableSoundSense ? false, soundSense, jdk
, enableStoneSense ? false
@@ -11,8 +11,6 @@ let
inherit enableStoneSense;
};
dfVersion = dwarf-fortress-original.dfVersion;
ptheme =
if builtins.isString theme
then builtins.getAttr theme themes
@@ -43,11 +41,7 @@ in
stdenv.mkDerivation rec {
name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";
compatible = lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) [
dwarf-fortress-original
dwarf-fortress-unfuck
dfhack
];
compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs;
dfInit = substituteAll {
name = "dwarf-fortress-init";
@@ -83,4 +77,3 @@ stdenv.mkDerivation rec {
preferLocalBuild = true;
}
pkgs/games/dwarf-fortress/wrapper/dfhack.in
+2 -3
View File
@@ -7,6 +7,5 @@ for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do
done
cd "$DF_DIR"
export LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH"
export LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD"
exec "$env_dir/libs/Dwarf_Fortress" "$@"
LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \
LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@"