From b74113e193a857fa898680668bad482d3ec5b8c7 Mon Sep 17 00:00:00 2001 From: ysander Date: Sun, 4 Aug 2019 18:02:00 +0200 Subject: [PATCH] Add dependency and patch files (refs: #65786) --- .../interpreters/love/0.7-gl-prototypes.patch | 21 +++++++++++++++++++ pkgs/development/interpreters/love/0.7.nix | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/love/0.7-gl-prototypes.patch diff --git a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch new file mode 100644 index 000000000000..0b6778f6a90b --- /dev/null +++ b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch @@ -0,0 +1,21 @@ +diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp +--- love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:46:55.032982224 -0400 ++++ love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:47:22.356175299 -0400 +@@ -1,3 +1,5 @@ ++#define GL_GLEXT_PROTOTYPES ++ + #include "Framebuffer.h" + #include + +diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp +--- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:46:55.032982224 -0400 ++++ love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:47:33.346119890 -0400 +@@ -18,6 +18,8 @@ + * 3. This notice may not be removed or altered from any source distribution. + **/ + ++#define GL_GLEXT_PROTOTYPES ++ + #include "SpriteBatch.h" + + // STD diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 884225b6483e..7f39259c298e 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -2,6 +2,7 @@ , SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg +, libmng }: stdenv.mkDerivation rec { @@ -11,10 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; }; + # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696) + patches = [ ./0.7-gl-prototypes.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL libGLU_combined openal lua - libdevil freetype physfs libmodplug mpg123 libvorbis libogg + libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng ]; preConfigure = ''