diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-12 23:56:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 23:56:33 +0200 |
| commit | 7c204b7c2d488e09156e02a9530060ac8ca0e71e (patch) | |
| tree | 648a8025896fb39a7bf995d75d421974c12b9840 /pkgs | |
| parent | d0e647cde30e92ed8db8528666878febbacc5575 (diff) | |
| parent | 65d87f14908aab1bc9f5b3f468223413046e0565 (diff) | |
Merge pull request #141219 from astro/irrlicht
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/irrlicht/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 260be948ce1d1..7a68f130663d5 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm, zlib }: let common = import ./common.nix { inherit fetchzip; }; @@ -12,22 +12,29 @@ stdenv.mkDerivation rec { postPatch = '' sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp + '' + lib.optionalString stdenv.isAarch64 '' + substituteInPlace source/Irrlicht/Makefile \ + --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" ''; preConfigure = '' cd source/Irrlicht ''; - buildPhase = '' - make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm" + preBuild = '' + makeFlagsArray+=(sharedlib NDEBUG=1 LDFLAGS="-lX11 -lGL -lXxf86vm") ''; + enableParallelBuilding = true; + preInstall = '' sed -i s,/usr/local/lib,$out/lib, Makefile mkdir -p $out/lib ''; - buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; + buildInputs = [ + libGLU libGL libXrandr libX11 libXxf86vm + ] ++ lib.optional stdenv.isAarch64 zlib; meta = { homepage = "http://irrlicht.sourceforge.net/"; |