tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
freeimage: fix build on aarch64-darwin
Weijia Wang
3 years ago
fd0989d6
9a8d7bbf
+4
-1
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
freeimage
default.nix
top-level
all-packages.nix
+3
-1
pkgs/development/libraries/freeimage/default.nix
···
1
{ lib, stdenv, fetchsvn, darwin, libtiff
2
, libpng, zlib, libwebp, libraw, openexr, openjpeg
3
, libjpeg, jxrlib, pkg-config
4
-
, fixDarwinDylibNames }:
5
6
stdenv.mkDerivation {
7
pname = "freeimage";
···
39
] ++ lib.optionals stdenv.isDarwin [
40
darwin.cctools
41
fixDarwinDylibNames
0
0
42
];
43
buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];
44
···
1
{ lib, stdenv, fetchsvn, darwin, libtiff
2
, libpng, zlib, libwebp, libraw, openexr, openjpeg
3
, libjpeg, jxrlib, pkg-config
4
+
, fixDarwinDylibNames, autoSignDarwinBinariesHook }:
5
6
stdenv.mkDerivation {
7
pname = "freeimage";
···
39
] ++ lib.optionals stdenv.isDarwin [
40
darwin.cctools
41
fixDarwinDylibNames
42
+
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
43
+
autoSignDarwinBinariesHook
44
];
45
buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];
46
+1
pkgs/top-level/all-packages.nix
···
18487
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
18488
18489
freeimage = callPackage ../development/libraries/freeimage {
0
18490
libraw = libraw_unstable;
18491
};
18492
···
18487
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
18488
18489
freeimage = callPackage ../development/libraries/freeimage {
18490
+
inherit (darwin) autoSignDarwinBinariesHook;
18491
libraw = libraw_unstable;
18492
};
18493