diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2018-06-19 14:09:40 +0200 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-07-14 14:24:35 +0200 |
| commit | 5c2ccd13a35f76e63179d4e0a40dacfa839a7547 (patch) | |
| tree | e99d562be47f0a9bcedb93f09b3ec7234d2595f6 /pkgs/games/dwarf-fortress/dfhack | |
| parent | 9125e448df45a7ec12b3916ab02688b08aa92b1e (diff) | |
| download | nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.tar nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.tar.gz nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.tar.bz2 nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.tar.lz nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.tar.xz nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.tar.zst nixpkgs-5c2ccd13a35f76e63179d4e0a40dacfa839a7547.zip | |
dwarf-fortress: re-include stonesense fix
This partially reverts commit dfc4744afd82b2d26a8df71b05ffacf05230af50. cc @matthewbauer
Diffstat (limited to 'pkgs/games/dwarf-fortress/dfhack')
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 3acd556e80c..baad4529844 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -46,6 +46,7 @@ let fetchSubmodules = true; }; + patches = [ ./fix-stonesense.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch new file mode 100644 index 00000000000..da860cd5562 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch @@ -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 \ No newline at end of file |