Unverified Commit f4e7986b authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

Merge pull request #195686 from wegank/perceptualdiff-darwin 

perceptualdiff: unbreak on aarch64-darwin
parents efdc9df2 5430715f

pkgs/development/libraries/freeimage/default.nix

+3 −1
Original line number Diff line number Diff line 
{ 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 ];

pkgs/tools/graphics/perceptualdiff/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -20,6 +20,5 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ uri-canva ];

    platforms = platforms.unix;

    broken = stdenv.hostPlatform.system == "aarch64-darwin";

  };

}

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;















  };