diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-07-27 15:54:23 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-07-27 17:07:44 +0300 |
| commit | 342b987b195a15819d0547239ece34cb421f48b3 (patch) | |
| tree | c7a26da7023381763cbc89d7f9aae1b1a87f612b /pkgs | |
| parent | f4312a30241fd88c3b4bb38ba62999865073ad94 (diff) | |
| download | nixlib-342b987b195a15819d0547239ece34cb421f48b3.tar nixlib-342b987b195a15819d0547239ece34cb421f48b3.tar.gz nixlib-342b987b195a15819d0547239ece34cb421f48b3.tar.bz2 nixlib-342b987b195a15819d0547239ece34cb421f48b3.tar.lz nixlib-342b987b195a15819d0547239ece34cb421f48b3.tar.xz nixlib-342b987b195a15819d0547239ece34cb421f48b3.tar.zst nixlib-342b987b195a15819d0547239ece34cb421f48b3.zip | |
dwarf-fortress-packages.dfhack: 0.43.05-r1 -> 0.43.05-r2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index ba9cd1e58055..0247d69bb563 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,14 +5,12 @@ let dfVersion = "0.43.05"; - # version = "${dfVersion}-r1"; - # rev = "refs/tags/${version}"; - version = "${dfVersion}-r1"; + version = "${dfVersion}-r2"; rev = "refs/tags/${version}"; - sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w"; + sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c"; # revision of library/xml submodule - xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da"; + xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9"; arch = 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. 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 = '' export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" ''; |