diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 14:59:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 14:59:39 +0100 |
| commit | 56b4a71c21c0a4c0d9ee747ce7a02555055c324e (patch) | |
| tree | 4b1cac354067d61463afc708ead14bed17ede0fd /pkgs/tools | |
| parent | 03ba2960a44a23a5683ceac3bea30bf724792594 (diff) | |
| download | nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.tar nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.tar.gz nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.tar.bz2 nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.tar.lz nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.tar.xz nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.tar.zst nixlib-56b4a71c21c0a4c0d9ee747ce7a02555055c324e.zip | |
netpbm: update and attempt to fix i686 build
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 06a89a1e2da4..2af863e37bc7 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchsvn, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper }: +{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11 }: +let rev = 1742; in stdenv.mkDerivation { - name = "netpbm-advanced-1177"; + name = "netpbm-advanced-${toString rev}"; src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; - rev = 1656; - sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9"; + inherit rev; + sha256 = "0csx6g0ci66nx1a6z0a9dkpfp66mdvcpp5r7g6zrx4jp18r9hzb2"; }; - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform - buildInputs = [ flex zlib perl libpng libjpeg libxml2 makeWrapper ]; + buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 ]; configurePhase = "cp config.mk.in config.mk"; |