public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imagemagick: Try to fix Darwin build

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-05 22:43:09 +02:00
parent 8647ddb0d3
commit 26e044b14a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/ImageMagick/7.0.nix
+5 -1
View File
@@ -2,6 +2,7 @@
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices , ApplicationServices
, Foundation
}: }:
let let
@@ -50,7 +51,10 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ] [ openexr librsvg openjpeg ]
++ lib.optional stdenv.isDarwin ApplicationServices; ++ lib.optionals stdenv.isDarwin [
ApplicationServices
Foundation
];
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 freetype libjpeg lcms2 ] [ bzip2 freetype libjpeg lcms2 ]
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -24028,7 +24028,7 @@ in
}); });
imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
}); });
inherit (nodePackages) imapnotify; inherit (nodePackages) imapnotify;