From 6bdecbf1ba4121c09ab120999e9f8cd3ca32f482 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 9 Jan 2017 23:24:17 +0100 Subject: graphviz: add darwin frameworks --- pkgs/tools/graphics/graphviz/2.32.nix | 3 ++- pkgs/tools/graphics/graphviz/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 10 +++++++--- 3 files changed, 12 insertions(+), 6 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed648b568c2d..ae8ea57eb017 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; -- cgit 1.4.1