diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-09 23:24:17 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-10 22:20:25 +0100 |
| commit | 6bdecbf1ba4121c09ab120999e9f8cd3ca32f482 (patch) | |
| tree | 447e07867352964fca8107fdc45ce1fedd43c9c3 /pkgs/tools/graphics/graphviz | |
| parent | 0300418a6998058d45cd377ad81ea5c7ddb05ca2 (diff) | |
graphviz: add darwin frameworks
Diffstat (limited to 'pkgs/tools/graphics/graphviz')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index a09d60f788c7..c4a0981dbb3c 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -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"; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index e815cded09a1..b0ccc5428bb8 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -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"; |