mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
dwarf-fortress: re-include stonesense fix
This partially reverts commit dfc4744afd
.
cc @matthewbauer
This commit is contained in:
parent
9125e448df
commit
5c2ccd13a3
@ -46,6 +46,7 @@ let
|
|||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./fix-stonesense.patch ];
|
||||||
nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
|
nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
|
||||||
# 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 SDL ]
|
buildInputs = [ zlib SDL ]
|
||||||
|
23
pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
Normal file
23
pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
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
|
Loading…
Reference in New Issue
Block a user