diff options
| author | Richard Zetterberg <richard.zetterberg@googlemail.com> | 2015-04-03 20:45:50 +0200 |
|---|---|---|
| committer | Richard Zetterberg <richard.zetterberg@googlemail.com> | 2015-04-03 20:45:50 +0200 |
| commit | 46178f057e0e133b5948a11076d53ddf7c8cb8eb (patch) | |
| tree | 16a17cec5ae1b9af948307058ca1b03946513a49 /pkgs/development/libraries/irrlicht | |
| parent | 6d4a9fa393bfc8d5aaf4fda85ddb9a531104c4cf (diff) | |
| download | nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.tar nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.tar.gz nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.tar.bz2 nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.tar.lz nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.tar.xz nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.tar.zst nixpkgs-46178f057e0e133b5948a11076d53ddf7c8cb8eb.zip | |
Fixes irrlicht and minetest to work with mesa > 10
Diffstat (limited to 'pkgs/development/libraries/irrlicht')
| -rw-r--r-- | pkgs/development/libraries/irrlicht/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch | 40 |
2 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index ac67c17218f..a682b3a6b82 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; }; - patchPhase = '' + patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; + + postPatch = '' sed -i /stdcall-alias/d source/Irrlicht/Makefile ''; diff --git a/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch b/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch new file mode 100644 index 00000000000..e90ff36443a --- /dev/null +++ b/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch @@ -0,0 +1,40 @@ +From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 +From: hiker <henrichsjoerg@mgail.com> +Date: Wed, 26 Feb 2014 11:13:03 +1100 +Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation + problems. + +--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h ++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h +@@ -21,6 +21,7 @@ + #endif + #include <GL/gl.h> + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #include "wglext.h" +@@ -35,6 +36,7 @@ + #endif + #include <OpenGL/gl.h> + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) +@@ -48,6 +50,7 @@ + #define NO_SDL_GLEXT + #include <SDL/SDL_video.h> + #include <SDL/SDL_opengl.h> ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +@@ -60,6 +63,7 @@ + #include <GL/gl.h> + #include <GL/glx.h> + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h + #include "glxext.h" |