cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

freeimage: fix build on aarch64-darwin

Browse source
This commit is contained in:
Weijia Wang 2022-10-12 18:46:32 +02:00
parent 9a8d7bbfd1
commit fd0989d64c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/freeimage/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchsvn, darwin, libtiff { lib, stdenv, fetchsvn, darwin, libtiff
, libpng, zlib, libwebp, libraw, openexr, openjpeg , libpng, zlib, libwebp, libraw, openexr, openjpeg
, libjpeg, jxrlib, pkg-config , libjpeg, jxrlib, pkg-config
, fixDarwinDylibNames }: , fixDarwinDylibNames, autoSignDarwinBinariesHook }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "freeimage"; pname = "freeimage";
@ -39,6 +39,8 @@ stdenv.mkDerivation {
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.cctools darwin.cctools
fixDarwinDylibNames fixDarwinDylibNames
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook
]; ];
buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];

1
pkgs/top-level/all-packages.nix
View file

@ -18487,6 +18487,7 @@ with pkgs;
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
freeimage = callPackage ../development/libraries/freeimage { freeimage = callPackage ../development/libraries/freeimage {
inherit (darwin) autoSignDarwinBinariesHook;
libraw = libraw_unstable; libraw = libraw_unstable;
}; };