Author: eelco
Date: Mon Feb 14 10:01:58 2011
New Revision: 25947
URL: https://svn.nixos.org/websvn/nix/?rev=25947&sc=1
Log:
* Graphviz: fix the build and update it to 2.26.3.
Modified:
nixpkgs/branches/x-updates/pkgs/tools/graphics/graphviz/default.nix
Modified: nixpkgs/branches/x-updates/pkgs/tools/graphics/graphviz/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/tools/graphics/graphviz/default.nix Mon Feb
14 05:01:33 2011 (r25946)
+++ nixpkgs/branches/x-updates/pkgs/tools/graphics/graphviz/default.nix Mon Feb
14 10:01:58 2011 (r25947)
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
-, yacc, libtool, fontconfig, pango, gd
+{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
+, yacc, libtool, fontconfig, pango, gd, xlibs
}:
-assert libpng != null && libjpeg != null && expat != null;
-
stdenv.mkDerivation rec {
- name = "graphviz-2.22.2";
+ name = "graphviz-2.26.3";
src = fetchurl {
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 =
[ "--with-pngincludedir=${libpng}/include"
@@ -22,7 +23,7 @@
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
]
- ++ stdenv.lib.optional (x11 == null) "--without-x";
+ ++ stdenv.lib.optional (xlibs == null) "--without-x";
meta = {
description = "A program for visualising graphs";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
