dwarf-fortress-packages.dfhack: 0.42.06-r1 -> 0.43.03-r1
This commit is contained in:
@@ -5,8 +5,9 @@
|
||||
}:
|
||||
|
||||
let
|
||||
dfVersion = "0.42.06";
|
||||
dfVersion = "0.43.03";
|
||||
version = "${dfVersion}-r1";
|
||||
|
||||
rev = "refs/tags/${version}";
|
||||
# revision of library/xml submodule
|
||||
xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0";
|
||||
@@ -14,7 +15,7 @@ let
|
||||
fakegit = writeScriptBin "git" ''
|
||||
#! ${stdenv.shell}
|
||||
if [ "$*" = "describe --tags --long" ]; then
|
||||
echo "${dfVersion}-unknown"
|
||||
echo "${version}-unknown"
|
||||
elif [ "$*" = "rev-parse HEAD" ]; then
|
||||
if [ "$(dirname "$(pwd)")" = "xml" ]; then
|
||||
echo "${xmlRev}"
|
||||
@@ -35,19 +36,20 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "https://github.com/DFHack/dfhack";
|
||||
inherit rev;
|
||||
sha256 = "1p234m8r84cdr4bx622hcd13mshnjc5bw7hdxhv18waaxvdpv6jh";
|
||||
sha256 = "0m5kqpaz0ypji4c32w0hhbsicvgvnjh56pqvq7af6pqqnyg1nzcx";
|
||||
};
|
||||
|
||||
patches = [ ./use-system-libraries.patch ];
|
||||
postPatch = "sed '1i#include <math.h>' -i plugins/3dveins.cpp";
|
||||
|
||||
nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
|
||||
# we can't use native Lua; upstream uses private headers
|
||||
buildInputs = [ zlib jsoncpp protobuf tinyxml ];
|
||||
|
||||
cmakeFlags = [ "-DEXTERNAL_TINYXML=ON" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = { inherit dfVersion; };
|
||||
passthru = { inherit version dfVersion; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
|
||||
|
||||
Reference in New Issue
Block a user