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

graphviz: add darwin frameworks

Browse Source
This commit is contained in:
Daiderd Jordan
2017-01-09 23:24:17 +01:00
parent 0300418a69
commit 6bdecbf1ba
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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";