summary refs log tree commit diff
path: root/pkgs/development/libraries/libtiff/default.nix
diff options
context:
space:
mode:
authorAndrew Dunham <andrew@du.nham.ca>2018-11-27 02:11:03 -0800
committerLéo Gaspard <leo@gaspard.io>2018-11-28 10:43:44 +0900
commitac3b358a8ccb42bc116dd08366aa5ab3f252c42b (patch)
tree647889b31169d471c9f31c85d6ba54e57657d18c /pkgs/development/libraries/libtiff/default.nix
parenta5de78b7d7a794b744594bda47f3d11ce985d48d (diff)
downloadnixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.tar
nixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.tar.gz
nixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.tar.bz2
nixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.tar.lz
nixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.tar.xz
nixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.tar.zst
nixpkgs-ac3b358a8ccb42bc116dd08366aa5ab3f252c42b.zip
libtiff: 2018-11-04 -> 4.0.10
Diffstat (limited to 'pkgs/development/libraries/libtiff/default.nix')
-rw-r--r--pkgs/development/libraries/libtiff/default.nix24
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 4176bb9555f..55c747540f7 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,11 +1,7 @@
 { stdenv
-, fetchFromGitLab
+, fetchurl
 
 , pkgconfig
-, autogen
-, autoconf
-, automake
-, libtool
 
 , zlib
 , libjpeg
@@ -13,26 +9,22 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2018-11-04";
-  name = "libtiff-unstable-${version}";
-
-  src = fetchFromGitLab {
-    owner = "libtiff";
-    repo = "libtiff";
-    rev = "779e54ca32b09155c10d398227a70038de399d7d";
-    sha256 = "029fmn0rdmb5gxhg83ff9j2zx3qk6wsiaiv554jq26pdc23achsp";
+  version = "4.0.10";
+  name = "libtiff-${version}";
+
+  src = fetchurl {
+    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
+    sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
   };
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig autogen autoconf automake libtool ];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
 
   enableParallelBuilding = true;
 
-  preConfigure = "./autogen.sh";
-
   doCheck = true; # not cross;
 
   meta = with stdenv.lib; {