diff options
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 3a0771a73ef..f5c475ef93a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, ApplicationServices }: let @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") [ openexr librsvg openjpeg ] - ; + ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e7f0a6b11d9..3364a661e0c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, ApplicationServices }: let @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") [ openexr librsvg openjpeg ] - ; + ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae8ea57eb01..7fb528c6465 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13697,7 +13697,9 @@ in ghostscript = null; }; - imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; + imagemagickBig = callPackage ../applications/graphics/ImageMagick { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; imagemagick7_light = lowPrio (imagemagick7.override { bzip2 = null; @@ -13723,7 +13725,9 @@ in ghostscript = null; }); - imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { }); + imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }); # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; |