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

Merge pull request #21791 from LnL7/darwin-cairo-fixes

Browse Source 
cairo related fixes
This commit is contained in:
Daiderd Jordan 2017-01-11 00:45:16 +01:00 committed by GitHub
commit 43266905d1
6 changed files with 28 additions and 12 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
, 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 ]

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

@ -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 ]

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
View File

@ -1,6 +1,7 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
, libintlOrEmpty
, ApplicationServices
, # Whether to build no plugins that have external dependencies
# (except the ALSA plugin).
minimalDeps ? false
@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
liboil ]
# can't build cdparanoia on darwin
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
++ libintlOrEmpty;
++ libintlOrEmpty
++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

3
pkgs/tools/graphics/graphviz/2.32.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo
, ApplicationServices
}:
stdenv.mkDerivation rec {
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd gts
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices gettext ];
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";

5
pkgs/tools/graphics/graphviz/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat
, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
, flex
, ApplicationServices
}:
stdenv.mkDerivation rec {
@ -20,9 +21,9 @@ stdenv.mkDerivation rec {
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
] ++ stdenv.lib.optionals (xorg != null)
(with xorg; [ xlibsWrapper libXrender libXaw libXpm ])
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
++ stdenv.lib.optionals (stdenv.isDarwin) [ ApplicationServices gettext ];
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
"-I${cairo.dev}/include/cairo";
configureFlags = stdenv.lib.optional (xorg == null) "--without-x";

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

@ -1988,9 +1988,11 @@ in
pythonPackages = pypyPackages;
};
graphviz = callPackage ../tools/graphics/graphviz { };
graphviz = callPackage ../tools/graphics/graphviz {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
graphviz-nox = callPackage ../tools/graphics/graphviz {
graphviz-nox = graphviz.override {
xorg = null;
libdevil = libdevil-nox;
};
@ -2005,7 +2007,9 @@ in
* that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
* objections before removal. The feature is libgraph.
*/
graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
grin = callPackage ../tools/text/grin { };
ripgrep = callPackage ../tools/text/ripgrep { };
@ -7385,7 +7389,9 @@ in
bison = bison2;
};
gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {};
gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
@ -13696,7 +13702,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;
@ -13722,7 +13730,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 { };