diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-06 18:07:42 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-06 19:19:29 -0400 |
| commit | dfc4744afd82b2d26a8df71b05ffacf05230af50 (patch) | |
| tree | 867ba5bd4edb16b7b3bf945d23e003d484ba00b1 /pkgs/games/dwarf-fortress/dfhack | |
| parent | 91184d159d000f74505eae336eeae5999e82b177 (diff) | |
| download | nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.tar nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.tar.gz nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.tar.bz2 nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.tar.lz nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.tar.xz nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.tar.zst nixlib-dfc4744afd82b2d26a8df71b05ffacf05230af50.zip | |
dwarf-fortress: 44.09 → 44.10
Diffstat (limited to 'pkgs/games/dwarf-fortress/dfhack')
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch | 23 |
2 files changed, 8 insertions, 33 deletions
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 641676489ed9..a77f50a51711 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -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 ] diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch deleted file mode 100644 index da860cd55624..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch +++ /dev/null @@ -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 \ No newline at end of file |