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

dwarf-fortress-packages.dfhack: 0.43.05-r1 -> 0.43.05-r2

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-07-27 15:54:23 +03:00
parent f4312a3024
commit 342b987b19
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/games/dwarf-fortress/dfhack/default.nix
View File

@ -5,14 +5,12 @@
let let
dfVersion = "0.43.05"; dfVersion = "0.43.05";
# version = "${dfVersion}-r1"; version = "${dfVersion}-r2";
# rev = "refs/tags/${version}";
version = "${dfVersion}-r1";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w"; sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c";
# revision of library/xml submodule # revision of library/xml submodule
xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da"; xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9";
arch = arch =
if stdenv.system == "x86_64-linux" then "64" if stdenv.system == "x86_64-linux" then "64"
@ -51,6 +49,12 @@ in stdenv.mkDerivation rec {
# We don't use system libraries because dfhack needs old C++ ABI. # We don't use system libraries because dfhack needs old C++ ABI.
buildInputs = [ zlib ]; buildInputs = [ zlib ];
preConfigure = ''
# Trick build system into believing we have .git
mkdir -p .git/modules/library/xml
touch .git/index .git/modules/library/xml/index
'';
preBuild = '' preBuild = ''
export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
''; '';