mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 12:53:59 +03:00
* Graphviz: fix the build and update it to 2.26.3.
svn path=/nixpkgs/branches/x-updates/; revision=25947
This commit is contained in:
parent
5042a81534
commit
a3f620c3cc
@ -1,18 +1,19 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
|
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
|
||||||
, yacc, libtool, fontconfig, pango, gd
|
, yacc, libtool, fontconfig, pango, gd, xlibs
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert libpng != null && libjpeg != null && expat != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "graphviz-2.22.2";
|
name = "graphviz-2.26.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
|
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
|
||||||
sha256 = "1yzda1al32la3wyrxwc1hs83sx9p84zh6xlpcpkx90xvjaav827v";
|
sha256 = "18bzyg17ni0lpcd2g5dhan8fjv3vzkjym38jq8vm42did5p9j47l";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
|
buildInputs =
|
||||||
|
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
|
||||||
|
pango gd
|
||||||
|
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--with-pngincludedir=${libpng}/include"
|
[ "--with-pngincludedir=${libpng}/include"
|
||||||
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||||||
"--with-expatincludedir=${expat}/include"
|
"--with-expatincludedir=${expat}/include"
|
||||||
"--with-expatlibdir=${expat}/lib"
|
"--with-expatlibdir=${expat}/lib"
|
||||||
]
|
]
|
||||||
++ stdenv.lib.optional (x11 == null) "--without-x";
|
++ stdenv.lib.optional (xlibs == null) "--without-x";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A program for visualising graphs";
|
description = "A program for visualising graphs";
|
||||||
|
Loading…
Reference in New Issue
Block a user