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

graphviz: Add a no x dependency version

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-18 18:11:34 -08:00
parent f94d0c3aa7
commit 47f9a276c3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
'';

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

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