From fd0989d64cd779d287ec6c753a3f22ebfd617090 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 18:46:32 +0200 Subject: [PATCH] freeimage: fix build on aarch64-darwin --- pkgs/development/libraries/freeimage/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 807e96669c67..dd5056ced93f 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchsvn, darwin, libtiff , libpng, zlib, libwebp, libraw, openexr, openjpeg , libjpeg, jxrlib, pkg-config -, fixDarwinDylibNames }: +, fixDarwinDylibNames, autoSignDarwinBinariesHook }: stdenv.mkDerivation { pname = "freeimage"; @@ -39,6 +39,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools fixDarwinDylibNames + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7546d684a7..1ef4a95369ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18487,6 +18487,7 @@ with pkgs; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; freeimage = callPackage ../development/libraries/freeimage { + inherit (darwin) autoSignDarwinBinariesHook; libraw = libraw_unstable; };