diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-04-06 13:24:46 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-04-06 13:24:46 +0000 |
| commit | f6c28984f2568e3eee4ce988364075a31636b4f3 (patch) | |
| tree | 829c233846f04a16d2cc4bc5374199bb48370189 /pkgs/tools/graphics/netpbm | |
| parent | 2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b (diff) | |
| download | nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.tar nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.tar.gz nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.tar.bz2 nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.tar.lz nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.tar.xz nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.tar.zst nixlib-f6c28984f2568e3eee4ce988364075a31636b4f3.zip | |
Update netpbm
svn path=/nixpkgs/trunk/; revision=20956
Diffstat (limited to 'pkgs/tools/graphics/netpbm')
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/graphics/netpbm/rgbpaths.patch | 16 |
2 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 568762e3ded7..a9d3b5c394c9 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,16 +1,14 @@ {stdenv, fetchsvn, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper }: stdenv.mkDerivation { - name = "netpbm-advanced-844"; + name = "netpbm-advanced-1177"; src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; - rev = 844; - sha256 = "8729e63bb5cc9fd500a68d5aed91fa4b973ebc068e3014b47390ba7b4d85968e"; + rev = 1177; + sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f"; }; - patches = [ ./rgbpaths.patch ]; - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; buildInputs = [ flex zlib perl libpng libjpeg libxml2 makeWrapper ]; diff --git a/pkgs/tools/graphics/netpbm/rgbpaths.patch b/pkgs/tools/graphics/netpbm/rgbpaths.patch deleted file mode 100644 index 0e6baa78bfe7..000000000000 --- a/pkgs/tools/graphics/netpbm/rgbpaths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur advanced.orig/pm_config.in.h advanced/pm_config.in.h ---- advanced.orig/pm_config.in.h 2010-01-12 22:04:07.000000000 +0100 -+++ advanced/pm_config.in.h 2010-01-12 22:05:56.000000000 +0100 -@@ -67,9 +67,9 @@ - #define RGB_DB2 "PBMplus_Dir:RGB.TXT" - #define RGB_DB3 "PBMplus_Dir:RGB.TXT" - #else --#define RGB_DB1 "/usr/lib/X11/rgb.txt" --#define RGB_DB2 "/usr/share/X11/rgb.txt" --#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" -+#define RGB_DB1 "@rgbPath1@" -+#define RGB_DB2 "@rgbPath2@" -+#define RGB_DB3 "@rgbPath3@" - #endif - - /* CONFIGURE: This is the name of an environment variable that tells |