Merge pull request #49860 from andrew-d/andrew/upgrade-libtiff

libtiff: 4.0.9 -> 2018-11-04

pkgs/development/libraries/libtiff/default.nix

@@ -1,36 +1,38 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv
+, fetchFromGitLab
+
+, pkgconfig
+, autogen
+, autoconf
+, automake
+, libtool
+
+, zlib
+, libjpeg
+, xz
+}:
 
-let
-  version = "4.0.9";
-in
 stdenv.mkDerivation rec {
-  name = "libtiff-${version}";
+  version = "2018-11-04";
+  name = "libtiff-unstable-${version}";
 
-  src = fetchurl {
+  src = fetchFromGitLab {
-    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
+    owner = "libtiff";
-    sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
+    repo = "libtiff";
+    rev = "779e54ca32b09155c10d398227a70038de399d7d";
+    sha256 = "029fmn0rdmb5gxhg83ff9j2zx3qk6wsiaiv554jq26pdc23achsp";
   };
 
-  prePatch = let
-      debian = fetchurl {
-        # When the URL disappears, it typically means that Debian has new patches
-        # (probably security) and updating to new tarball will apply them as well.
-        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
-        sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
-      };
-    in ''
-      tar xf ${debian}
-      patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
-    '';
-
   outputs = [ "bin" "dev" "out" "man" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autogen autoconf automake libtool ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
 
   enableParallelBuilding = true;
 
+  preConfigure = "./autogen.sh";
+
   doCheck = true; # not cross;
 
   meta = with stdenv.lib; {