Merge pull request #6533 from michelk/gdal_1.11.2

gdal: update to 1.11.2
This commit is contained in:
vbgl 2015-02-24 22:45:50 +01:00
commit 8300898f98

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, python, pythonPackages, proj}:
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos}:
composableDerivation.composableDerivation {} (fixed: rec {
version = "1.11.1";
version = "1.11.2";
name = "gdal-${version}";
src = fetchurl {
url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl";
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
};
buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ];
@ -26,6 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
"--with-geotiff=${libgeotiff}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional
];
meta = {