lol

Merge pull request #141219 from astro/irrlicht

authored by

Sandro and committed by
GitHub
7c204b7c d0e647cd

+11 -4
+11 -4
pkgs/development/libraries/irrlicht/default.nix
··· 1 - { lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: 1 + { lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm, zlib }: 2 2 3 3 let 4 4 common = import ./common.nix { inherit fetchzip; }; ··· 12 12 13 13 postPatch = '' 14 14 sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp 15 + '' + lib.optionalString stdenv.isAarch64 '' 16 + substituteInPlace source/Irrlicht/Makefile \ 17 + --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" 15 18 ''; 16 19 17 20 preConfigure = '' 18 21 cd source/Irrlicht 19 22 ''; 20 23 21 - buildPhase = '' 22 - make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm" 24 + preBuild = '' 25 + makeFlagsArray+=(sharedlib NDEBUG=1 LDFLAGS="-lX11 -lGL -lXxf86vm") 23 26 ''; 27 + 28 + enableParallelBuilding = true; 24 29 25 30 preInstall = '' 26 31 sed -i s,/usr/local/lib,$out/lib, Makefile 27 32 mkdir -p $out/lib 28 33 ''; 29 34 30 - buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; 35 + buildInputs = [ 36 + libGLU libGL libXrandr libX11 libXxf86vm 37 + ] ++ lib.optional stdenv.isAarch64 zlib; 31 38 32 39 meta = { 33 40 homepage = "http://irrlicht.sourceforge.net/";