From 65d87f14908aab1bc9f5b3f468223413046e0565 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 10 Oct 2021 23:54:48 +0200 Subject: [PATCH] irrlicht: use makeFlagsArray, enableParallelBuilding --- pkgs/development/libraries/irrlicht/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index f35a75e54e7b..7a68f130663d 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -21,17 +21,20 @@ stdenv.mkDerivation rec { 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 ] - ++ lib.optional stdenv.isAarch64 zlib; + buildInputs = [ + libGLU libGL libXrandr libX11 libXxf86vm + ] ++ lib.optional stdenv.isAarch64 zlib; meta = { homepage = "http://irrlicht.sourceforge.net/";