From 47f9a276c3d1f34f37e0f61a62e350e22f44ae7b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Feb 2015 18:11:34 -0800 Subject: [PATCH] graphviz: Add a no x dependency version --- pkgs/tools/graphics/graphviz/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 5fecd69d802..31945c9f232 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { patches = [ ./0001-vimdot-lookup-vim-in-PATH.patch ]; buildInputs = - [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig - pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; - CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; + CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") + "-I${cairo}/include/cairo"; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; # "command -v" is POSIX, "which" is not - postInstall = '' + postInstall = stdenv.lib.optionalString (xlibs != null) '' sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty sed -i 's|which|command -v|' $out/bin/vimdot ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee1f4a49fbf..c43979a880f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1438,6 +1438,10 @@ let graphviz = callPackage ../tools/graphics/graphviz { }; + graphviz-nox = callPackage ../tools/graphics/graphviz { + xlibs = null; + }; + /* Readded by Michael Raskin. There are programs in the wild * that do want 2.0 but not 2.22. Please give a day's notice for * objections before removal. The feature is integer coordinates