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:57:07 -04:00
parent 8d5b5fa68e
commit dcea211084
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/games/dwarf-fortress/game.nix
View File

@ -29,7 +29,7 @@ let
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
sha256 = "1cxckszjh5fi9czywr1kl5kj9zxzaszhqdal5gd8ww0ihcbl7fcd"; sha256 = "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx";
}; };
}; };
@ -91,4 +91,3 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ]; maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
}; };
} }

3
pkgs/games/dwarf-fortress/unfuck.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
ncurses gtk2 libsndfile zlib libGL ncurses gtk2 libsndfile zlib libGL
]; ];
patchPhase = '' postPatch = ''
substituteInPlace CMakeLists.txt --replace \ substituteInPlace CMakeLists.txt --replace \
'set(CMAKE_BUILD_TYPE Release)' \ 'set(CMAKE_BUILD_TYPE Release)' \
'set(CMAKE_BUILD_TYPE Debug)' 'set(CMAKE_BUILD_TYPE Debug)'
@ -59,4 +59,3 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };
} }

11
pkgs/games/dwarf-fortress/wrapper/default.nix
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 , enableDFHack ? false, dfhack
, enableSoundSense ? false, soundSense, jdk , enableSoundSense ? false, soundSense, jdk
, enableStoneSense ? false , enableStoneSense ? false
@ -11,8 +11,6 @@ let
inherit enableStoneSense; inherit enableStoneSense;
}; };
dfVersion = dwarf-fortress-original.dfVersion;
ptheme = ptheme =
if builtins.isString theme if builtins.isString theme
then builtins.getAttr theme themes then builtins.getAttr theme themes
@ -43,11 +41,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}"; name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";
compatible = lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) [ compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs;
dwarf-fortress-original
dwarf-fortress-unfuck
dfhack
];
dfInit = substituteAll { dfInit = substituteAll {
name = "dwarf-fortress-init"; name = "dwarf-fortress-init";
@ -83,4 +77,3 @@ stdenv.mkDerivation rec {
preferLocalBuild = true; preferLocalBuild = true;
} }

5
pkgs/games/dwarf-fortress/wrapper/dfhack.in
View File

@ -7,6 +7,5 @@ for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do
done done
cd "$DF_DIR" cd "$DF_DIR"
export LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \
export LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@"
exec "$env_dir/libs/Dwarf_Fortress" "$@"