diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-02 11:57:07 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-02 11:59:36 -0400 |
| commit | dcea2110848c742e59b5bb6964637b65f945d2a0 (patch) | |
| tree | 89443de33fb4da26514868c05b8a2b75a7209b76 /pkgs/games/dwarf-fortress/wrapper | |
| parent | 8d5b5fa68e7d4679cf7fd0f122507a4ef1880908 (diff) | |
| download | nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.tar nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.tar.gz nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.tar.bz2 nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.tar.lz nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.tar.xz nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.tar.zst nixlib-dcea2110848c742e59b5bb6964637b65f945d2a0.zip | |
dwarf-fortress: cleanup
Diffstat (limited to 'pkgs/games/dwarf-fortress/wrapper')
| -rw-r--r-- | pkgs/games/dwarf-fortress/wrapper/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/games/dwarf-fortress/wrapper/dfhack.in | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 1ed58a892745..99625abd99d2 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -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; } - diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index 910d75ad8e15..4cf884ebed2c 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -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 "$@" |