jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #65957 from ysndr/fix/love_0_7

Browse Source 
Add dependency and patch files (refs: #65786)
This commit is contained in:
Michael Raskin 2019-08-06 16:28:57 +00:00 committed by GitHub
commit 735ca8b841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/interpreters/love/0.7-gl-prototypes.patch Normal file
View File

@ -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

6
pkgs/development/interpreters/love/0.7.nix
View File

@ -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 = ''