diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2011-07-01 13:29:42 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2011-07-01 13:29:42 +0000 |
commit | 9ee4b2ceab927fce8e15d76b39845676e876c8fe (patch) | |
tree | 9b0e2d9c8c5dcb23e93c253bbe8839f01520a056 /pkgs/tools | |
parent | 7762934904d6d994bdd70adce6e15398eccf6878 (diff) | |
download | nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.tar nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.tar.gz nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.tar.bz2 nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.tar.lz nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.tar.xz nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.tar.zst nixlib-9ee4b2ceab927fce8e15d76b39845676e876c8fe.zip |
Updating graphviz and adding an old version
svn path=/nixpkgs/trunk/; revision=27573
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/graphviz/2.24.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 13 |
2 files changed, 41 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.24.nix b/pkgs/tools/graphics/graphviz/2.24.nix new file mode 100644 index 000000000000..af04ab54dbe4 --- /dev/null +++ b/pkgs/tools/graphics/graphviz/2.24.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw +, yacc, libtool, fontconfig, pango, gd +}: + +assert libpng != null && libjpeg != null && expat != null; + +stdenv.mkDerivation rec { + name = "graphviz-2.24.0"; + + src = fetchurl { + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; + sha256 = "01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00"; + }; + + buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + + configureFlags = + [ "--with-pngincludedir=${libpng}/include" + "--with-pnglibdir=${libpng}/lib" + "--with-jpegincludedir=${libjpeg}/include" + "--with-jpeglibdir=${libjpeg}/lib" + "--with-expatincludedir=${expat}/include" + "--with-expatlibdir=${expat}/lib" + "--with-codegens" + ] + ++ stdenv.lib.optional (x11 == null) "--without-x"; + + meta = { + description = "A program for visualising graphs"; + homepage = http://www.graphviz.org/; + }; +} diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 191514f57f81..51de6b7b899a 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -3,17 +3,18 @@ }: stdenv.mkDerivation rec { - name = "graphviz-2.26.3"; + name = "graphviz-2.28.0"; src = fetchurl { url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "18bzyg17ni0lpcd2g5dhan8fjv3vzkjym38jq8vm42did5p9j47l"; + sha256 = "0xpwg99cd8sp0c6r8klsmc66h1pday64kmnr4v6f9jkqqmrpkank"; }; buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig - pango gd - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]; + pango gd zlib + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ++ stdenv.lib.optionals (gtk != null) [ gtk glib ]; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -25,6 +26,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (xlibs == null) "--without-x"; + preBuild = '' + sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile + ''; + meta = { description = "A program for visualising graphs"; homepage = http://www.graphviz.org/; |