dwarf-fortress: 44.09 → 44.10
This commit is contained in:
parent
91184d159d
commit
dfc4744afd
|
@ -1,13 +1,11 @@
|
|||
{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage
|
||||
{ stdenv, hostPlatform, lib, fetchFromGitHub, cmake, writeScriptBin, callPackage
|
||||
, perl, XMLLibXML, XMLLibXSLT, zlib
|
||||
, enableStoneSense ? false, allegro5, libGLU_combined
|
||||
}:
|
||||
|
||||
let
|
||||
dfVersion = "0.44.09";
|
||||
dfVersion = "0.44.10";
|
||||
version = "${dfVersion}-r1";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9";
|
||||
|
||||
# revision of library/xml submodule
|
||||
xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
|
||||
|
@ -25,7 +23,7 @@ let
|
|||
if [ "$(dirname "$(pwd)")" = "xml" ]; then
|
||||
echo "${xmlRev}"
|
||||
else
|
||||
echo "${rev}"
|
||||
echo "refs/tags/${version}"
|
||||
fi
|
||||
elif [ "$*" = "rev-parse HEAD:library/xml" ]; then
|
||||
echo "${xmlRev}"
|
||||
|
@ -38,13 +36,13 @@ in stdenv.mkDerivation rec {
|
|||
name = "dfhack-${version}";
|
||||
|
||||
# Beware of submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/DFHack/dfhack";
|
||||
inherit rev sha256;
|
||||
src = fetchFromGitHub {
|
||||
owner = "DFHack";
|
||||
repo = "dfhack";
|
||||
sha256 = "0srgymyd57hk9iffhi2i0ra5vzw2vzlpzn4042yb90vqpmvz2zrj";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
patches = [ ./fix-stonesense.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
|
||||
# We don't use system libraries because dfhack needs old C++ ABI.
|
||||
buildInputs = [ zlib ]
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
|
||||
From: Herwig Hochleitner <hhochleitner@gmail.com>
|
||||
Date: Sun, 1 Oct 2017 18:01:43 +0200
|
||||
Subject: [PATCH] include <GL/glext.h>
|
||||
|
||||
this fixes `GLhandleARB` not being defined
|
||||
---
|
||||
plugins/stonesense/common.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h
|
||||
index eb36691..ef45389 100644
|
||||
--- a/plugins/stonesense/common.h
|
||||
+++ b/plugins/stonesense/common.h
|
||||
@@ -31,6 +31,8 @@ using namespace df::enums;
|
||||
#include <allegro5/allegro_opengl.h>
|
||||
#include <allegro5/utf8.h>
|
||||
|
||||
+#include <GL/glext.h>
|
||||
+
|
||||
// allegro leaks X headers, undef some of it here:
|
||||
#undef TileShape
|
||||
#undef None
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dwarf-therapist-original-${version}";
|
||||
version = "39.3.1";
|
||||
version = "40.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dwarf-Therapist";
|
||||
repo = "Dwarf-Therapist";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vb0dg1r833gaa4jzlrxf9acn41az3xjs9alx7r9lkqwvkjyrdy2";
|
||||
sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
|
||||
};
|
||||
|
||||
outputs = [ "out" "layouts" ];
|
||||
|
|
|
@ -9,7 +9,7 @@ with lib;
|
|||
|
||||
let
|
||||
baseVersion = "44";
|
||||
patchVersion = "09";
|
||||
patchVersion = "10";
|
||||
dfVersion = "0.${baseVersion}.${patchVersion}";
|
||||
|
||||
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
|
||||
|
@ -21,15 +21,15 @@ let
|
|||
srcs = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
|
||||
sha256 = "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy";
|
||||
sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
|
||||
sha256 = "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8";
|
||||
sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
|
||||
sha256 = "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs";
|
||||
sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2016-1_196";
|
||||
dfVersion = "0.44.09";
|
||||
dfVersion = "0.44.10";
|
||||
inherit soundPack;
|
||||
name = "soundsense-${version}";
|
||||
src = fetchzip {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, ncurses, glib, gtk2, libsndfile, zlib
|
||||
}:
|
||||
|
||||
let dfVersion = "0.44.09"; in
|
||||
let dfVersion = "0.44.10"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dwarf_fortress_unfuck-${dfVersion}";
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
owner = "svenstaro";
|
||||
repo = "dwarf_fortress_unfuck";
|
||||
rev = dfVersion;
|
||||
sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
|
||||
sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
Loading…
Reference in a new issue