summary refs log tree commit diff
path: root/pkgs/development/interpreters/love
diff options
context:
space:
mode:
authorysander <ysander@techfak.uni-bielefeld.de>2019-08-04 18:02:00 +0200
committerysander <ysander@techfak.uni-bielefeld.de>2019-08-04 18:02:47 +0200
commitb74113e193a857fa898680668bad482d3ec5b8c7 (patch)
tree2f6029f0f5e4f0c6f43c6c66757bfba7ec2b143d /pkgs/development/interpreters/love
parentb2bd7725913383503bd03f6f99940e0ab737b6bd (diff)
downloadnixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.tar
nixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.tar.gz
nixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.tar.bz2
nixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.tar.lz
nixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.tar.xz
nixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.tar.zst
nixpkgs-b74113e193a857fa898680668bad482d3ec5b8c7.zip
Add dependency and patch files (refs: #65786)
Diffstat (limited to 'pkgs/development/interpreters/love')
-rw-r--r--pkgs/development/interpreters/love/0.7-gl-prototypes.patch21
-rw-r--r--pkgs/development/interpreters/love/0.7.nix6
2 files changed, 26 insertions, 1 deletions
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 00000000000..0b6778f6a90
--- /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 <common/Matrix.h>
+ 
+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 884225b6483..7f39259c298 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 = ''