From 4440cf6d8169e9171b87f11475a518a658fa4dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 6 Nov 2016 17:08:40 +0800 Subject: [PATCH] libgeotiff: 1.2.5 -> 1.4.2 (#20190) --- .../libraries/libgeotiff/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 01dd6b0d49e..496306c254d 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, libtiff }: +{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib}: -stdenv.mkDerivation { - name = "libgeotiff-1.2.5"; +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "libgeotiff-${version}"; src = fetchurl { - url = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; - sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; + url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; + sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"; }; - buildInputs = [ libtiff ]; + configureFlags = [ + "--with-jpeg=${libjpeg.dev}" + "--with-zlib=${zlib.dev}" + ]; + buildInputs = [ libtiff proj ]; hardeningDisable = [ "format" ];