diff options
Diffstat (limited to 'pkgs/development/libraries/irrlicht')
-rw-r--r-- | pkgs/development/libraries/irrlicht/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/irrlicht/mac.nix | 18 |
2 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index efb4c2022c4..260be948ce1 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { src = common.src; + postPatch = '' + sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp + ''; + preConfigure = '' cd source/Irrlicht ''; @@ -23,12 +27,12 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ]; + buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { homepage = "http://irrlicht.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 5f8335efab2..a7901466081 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { version = common.version; src = fetchFromGitHub { - owner = "quiark"; - repo = "IrrlichtCMake"; - rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; - sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; + owner = "quiark"; + repo = "IrrlichtCMake"; + rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; + sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; }; postUnpack = '' cp -r ${common.src}/* $sourceRoot/ chmod -R 777 $sourceRoot - ''; + ''; patches = [ ./mac_device.patch ]; dontFixCmake = true; @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ unzip OpenGL Cocoa IOKit ]; + buildInputs = [ OpenGL Cocoa IOKit ]; meta = { homepage = "http://irrlicht.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } |