nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195686 from wegank/perceptualdiff-darwin

Browse Source 
perceptualdiff: unbreak on aarch64-darwin
This commit is contained in:
Pavol Rusnak 2022-10-13 10:37:09 +02:00 committed by GitHub
commit f4e7986b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 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
, 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 ];

1
pkgs/tools/graphics/perceptualdiff/default.nix
View File

@ -20,6 +20,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ uri-canva ];
platforms = platforms.unix;
broken = stdenv.hostPlatform.system == "aarch64-darwin";
};
}

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

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