diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 20:35:33 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 20:35:33 +0000 |
| commit | 3652c61aeda9d4a02a681459bd656e43044b2b93 (patch) | |
| tree | f0d3861f5d21194a77b14e110e72ae136a688448 /pkgs/tools/graphics | |
| parent | 50a24846ac51a659b6eb0a8e0577658cff9ab032 (diff) | |
| parent | bf2579b4a3b4e7b8aaa5437f72b607019978f22e (diff) | |
| download | nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.tar nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.tar.gz nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.tar.bz2 nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.tar.lz nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.tar.xz nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.tar.zst nixlib-3652c61aeda9d4a02a681459bd656e43044b2b93.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32522
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.24.nix | 32 | ||||
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 4 |
2 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.24.nix b/pkgs/tools/graphics/graphviz/2.24.nix deleted file mode 100644 index af04ab54dbe4..000000000000 --- a/pkgs/tools/graphics/graphviz/2.24.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ 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/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index a9d3b5c394c9..06a89a1e2da4 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; - rev = 1177; - sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f"; + rev = 1656; + sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9"; }; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; |