BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update netpbm

Browse source 
svn path=/nixpkgs/trunk/; revision=20956
This commit is contained in:
Michael Raskin 2010-04-06 13:24:46 +00:00
parent 2aac41a8db
commit f6c28984f2
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/graphics/netpbm/default.nix
View file

@ -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 ];

16
pkgs/tools/graphics/netpbm/rgbpaths.patch
View file

@ -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