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

imagemagick: add darwin frameworks

Browse Source
This commit is contained in:
Daiderd Jordan 2017-01-10 23:03:49 +01:00
parent 6bdecbf1ba
commit 581a5aec88
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
, ApplicationServices
}: }:
let let
@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals (stdenv.cross.libc or null != "msvcrt") ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
[ openexr librsvg openjpeg ] [ openexr librsvg openjpeg ]
; ++ lib.optional stdenv.isDarwin ApplicationServices;
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 freetype libjpeg lcms2 ] [ bzip2 freetype libjpeg lcms2 ]

3
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
, ApplicationServices
}: }:
let let
@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals (stdenv.cross.libc or null != "msvcrt") ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
[ openexr librsvg openjpeg ] [ openexr librsvg openjpeg ]
; ++ lib.optional stdenv.isDarwin ApplicationServices;
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 freetype libjpeg lcms2 ] [ bzip2 freetype libjpeg lcms2 ]

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

@ -13697,7 +13697,9 @@ in
ghostscript = null; ghostscript = null;
}; };
imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; imagemagickBig = callPackage ../applications/graphics/ImageMagick {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
imagemagick7_light = lowPrio (imagemagick7.override { imagemagick7_light = lowPrio (imagemagick7.override {
bzip2 = null; bzip2 = null;
@ -13723,7 +13725,9 @@ in
ghostscript = null; 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, formerly known as "KeyJNote".
impressive = callPackage ../applications/office/impressive { }; impressive = callPackage ../applications/office/impressive { };