summary refs log tree commit diff
diff options
context:
space:
mode:
authorAstro <astro@spaceboyz.net>2021-10-10 22:58:30 +0200
committerAstro <astro@spaceboyz.net>2021-10-11 01:35:44 +0200
commitaec477db26edb5fb8d1c28b47a4ec796a094fd2e (patch)
tree91beb1c0330c3ed8ee5645c4f17060251a68cf36
parenta74daa0ec496a1039de74075d4db093764b2a8ec (diff)
downloadnixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.tar
nixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.tar.gz
nixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.tar.bz2
nixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.tar.lz
nixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.tar.xz
nixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.tar.zst
nixpkgs-aec477db26edb5fb8d1c28b47a4ec796a094fd2e.zip
irrlicht: fix on aarch64
-rw-r--r--pkgs/development/libraries/irrlicht/default.nix8
1 files 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/";