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

Merge pull request #7863 from C0DEHERO/fix/irrlicht-update

Browse Source 
irrlicht: update rev 3843 (1.8) -> rev 5104 (1.8)..
This commit is contained in:
Benno Fünfstück 2015-05-17 20:15:10 +02:00
commit 592e411c49
3 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/irrlicht/default.nix
View File

@ -2,21 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Version 3843 is required for supertuxkart name = "irrlicht-${version}-svn-${revision}";
name = "irrlicht-1.8-svn-3843"; version = "1.8";
revision = "5104"; # newest revision as of 05-16-15
src = fetchsvn { src = fetchsvn {
url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev)
rev = 3843; rev = "${revision}";
sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq";
}; };
patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
postPatch = ''
sed -i /stdcall-alias/d source/Irrlicht/Makefile
'';
preConfigure = '' preConfigure = ''
cd source/Irrlicht cd source/Irrlicht
''; '';
@ -30,11 +25,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib 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 ]; buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
meta = { meta = {

45
pkgs/development/libraries/irrlicht/irrlicht3843.nix Normal file
View File

@ -0,0 +1,45 @@
{ 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++";
};
}

3
pkgs/top-level/all-packages.nix
View File

@ -6299,7 +6299,8 @@ let
intltool = callPackage ../development/tools/misc/intltool { }; intltool = callPackage ../development/tools/misc/intltool { };
irrlicht3843 = callPackage ../development/libraries/irrlicht { }; irrlicht = callPackage ../development/libraries/irrlicht { };
irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
isocodes = callPackage ../development/libraries/iso-codes { }; isocodes = callPackage ../development/libraries/iso-codes { };