Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'

1 files changed, 67 insertions, 32 deletions

diff --git a/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
index 9de7603c9730..b2452be7339e 100644
--- a/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
@@ -1,70 +1,105 @@
-{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
-, makeWrapper, libtiff
-, enableX11 ? false, libX11 }:
+{ lib
+, stdenv
+, fetchsvn
+, pkgconfig
+, libjpeg
+, libpng
+, flex
+, zlib
+, perl
+, libxml2
+, makeWrapper
+, libtiff
+, enableX11 ? false
+, libX11
+}:
 
 stdenv.mkDerivation {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
-  name = "netpbm-10.82.01";
+  name = "netpbm-10.89.1";
+
+  outputs = [ "bin" "out" "dev" ];
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "3264";
-    sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf";
+    rev = "3735";
+    sha256 = "hRepEUBlf83p77Amjze+Qz7XTHhCuPdV01K/UabR89Q=";
   };
 
-  postPatch = /* CVE-2005-2471, from Arch */ ''
-    substituteInPlace converter/other/pstopnm.c \
-      --replace '"-DSAFER"' '"-DPARANOIDSAFER"'
+  postPatch = ''
+    # Install libnetpbm.so symlink to correct destination
+    substituteInPlace lib/Makefile \
+      --replace '/sharedlink' '/lib'
   '';
 
-  buildInputs =
-    [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libtiff ]
-    ++ lib.optional enableX11 libX11;
+  nativeBuildInputs = [
+    pkgconfig
+    flex
+    makeWrapper
+  ];
+
+  buildInputs = [
+    zlib
+    perl
+    libpng
+    libjpeg
+    libxml2
+    libtiff
+  ] ++ lib.optional enableX11 libX11;
 
   configurePhase = ''
+    runHook preConfigure
+
     cp config.mk.in config.mk
-    echo "STATICLIB_TOO = n" >> config.mk
-    substituteInPlace "config.mk" \
-        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
-        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \
-        --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \
-        --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include"
-   '' + stdenv.lib.optionalString stdenv.isDarwin ''
+
+    # Disable building static library
+    echo "STATICLIB_TOO = N" >> config.mk
+
+    # Use libraries from Nixpkgs
+    echo "TIFFLIB = libtiff.so" >> config.mk
+    echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk
+    echo "TIFFLIB_NEEDS_Z = N" >> config.mk
+    echo "JPEGLIB = libjpeg.so" >> config.mk
+
+    # Fix path to rgb.txt
+    echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
     echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
     echo "NETPBMLIBTYPE = dylib" >> config.mk
     echo "NETPBMLIBSUFFIX = dylib" >> config.mk
-  '';
 
-  preBuild = ''
-    export LDFLAGS="-lz"
-    substituteInPlace "pm_config.in.h" \
-        --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \
-        --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \
-        --subst-var-by "rgbPath3" "/var/empty/rgb.txt"
-    touch lib/standardppmdfont.c
+    runHook postConfigure
   '';
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   installPhase = ''
+    runHook preInstall
+
     make package pkgdir=$out
 
-    rm -rf $out/link $out/*_template $out/{pkginfo,README,VERSION} $out/man/web
+    rm -rf $out/*_template $out/{pkginfo,README,VERSION} $out/man/web
 
     mkdir -p $out/share/netpbm
     mv $out/misc $out/share/netpbm/
 
+    moveToOutput bin "''${!outputBin}"
+
     # wrap any scripts that expect other programs in the package to be in their PATH
     for prog in ppmquant; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin"
+        wrapProgram "''${!outputBin}/bin/$prog" --prefix PATH : "''${!outputBin}/bin"
     done
+
+    runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
-    homepage = http://netpbm.sourceforge.net/;
+    homepage = "http://netpbm.sourceforge.net/";
     description = "Toolkit for manipulation of graphic images";
-    license = "GPL,free";
+    license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }