diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/irrlicht | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/irrlicht')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/irrlicht/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/irrlicht/mac.nix | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index 84e7fae60450..e283a2909474 100644 --- a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { 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/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix b/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix index 5f8335efab2b..b41486ce9dd6 100644 --- a/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix +++ b/nixpkgs/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, unzip, 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; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { 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; }; } |