From aec477db26edb5fb8d1c28b47a4ec796a094fd2e Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 10 Oct 2021 22:58:30 +0200 Subject: irrlicht: fix on aarch64 --- pkgs/development/libraries/irrlicht/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 260be948ce1..f35a75e54e7 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,6 +12,9 @@ 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 = '' @@ -27,7 +30,8 @@ stdenv.mkDerivation rec { 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/"; -- cgit 1.4.1