From 1c44981d1982194d2c5aa31b12c582f74425603a Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 29 Aug 2017 15:04:46 -0400 Subject: [PATCH 1/2] irrlicht3843: Removed unused derivation supertuxcart includes its own version of irrlicht so this is no longer needed. --- .../irrlicht/irrlicht-1.8.1-mesa-10.x.patch | 40 ---------------- .../libraries/irrlicht/irrlicht3843.nix | 46 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 87 deletions(-) delete mode 100644 pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch delete mode 100644 pkgs/development/libraries/irrlicht/irrlicht3843.nix 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 deleted file mode 100644 index e90ff36443a..00000000000 --- a/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 -From: hiker -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 - #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 - #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 - #include -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -@@ -60,6 +63,7 @@ - #include - #include - #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" diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix deleted file mode 100644 index c6e5b35f9e2..00000000000 --- a/pkgs/development/libraries/irrlicht/irrlicht3843.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }: - - -stdenv.mkDerivation rec { - # Version 3843 is required for supertuxkart - name = "irrlicht-1.8-svn-3843"; - - src = fetchsvn { - url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; - rev = 3843; - sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; - }; - - patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; - - postPatch = '' - sed -i /stdcall-alias/d source/Irrlicht/Makefile - ''; - - preConfigure = '' - cd source/Irrlicht - ''; - - buildPhase = '' - make sharedlib NDEBUG=1 - ''; - - preInstall = '' - sed -i s,/usr/local/lib,$out/lib, Makefile - mkdir -p $out/lib - ''; - - postInstall = '' - ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8 - ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so - ''; - - buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; - - meta = { - homepage = http://irrlicht.sourceforge.net/; - license = stdenv.lib.licenses.zlib; - description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ad587a4483..bbfdbdb24ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8428,7 +8428,6 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; irrlicht = callPackage ../development/libraries/irrlicht { }; - irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { }; isocodes = callPackage ../development/libraries/iso-codes { }; From 4bf96227493327f9075aad8a0d2c134b2bc58193 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 29 Aug 2017 15:06:49 -0400 Subject: [PATCH 2/2] irrlicht: 1.8-svn-5104 -> 1.8.4 --- pkgs/development/libraries/irrlicht/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index bc3e1a20abb..336f446cdf1 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,15 +1,13 @@ -{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }: +{ stdenv, fetchzip, mesa, unzip, libXrandr, libX11, libXxf86vm }: stdenv.mkDerivation rec { - name = "irrlicht-${version}-svn-${revision}"; - version = "1.8"; - revision = "5104"; # newest revision as of 05-16-15 + name = "irrlicht-${version}"; + version = "1.8.4"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev) - rev = "${revision}"; - sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq"; + src = fetchzip { + url = "mirror://sourceforge/irrlicht/${name}.zip"; + sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f"; }; preConfigure = ''