Merge pull request #5296 from michelk/gdal-1.11.1

gdal: update to 1.11.1 and compiling with proj
This commit is contained in:
vbgl 2014-12-15 13:36:32 +01:00
commit fed9a36f74

View File

@ -1,28 +1,30 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, python, pythonPackages}: , postgresql, mysql, libgeotiff, python, pythonPackages, proj}:
composableDerivation.composableDerivation {} (fixed: rec { composableDerivation.composableDerivation {} (fixed: rec {
name = "gdal-1.11.0"; version = "1.11.1";
name = "gdal-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz"; url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
md5 = "9fdf0f2371a3e9863d83e69951c71ec4"; sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl";
}; };
buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy]; buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj];
# don't use optimization for gcc >= 4.3. That's said to be causeing segfaults # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults
preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0";
configureFlags = [ configureFlags = [
"--with-jpeg=${libjpeg}" "--with-jpeg=${libjpeg}"
"--with-libtiff=${libtiff}" # optional (without largetiff support "--with-libtiff=${libtiff}" # optional (without largetiff support
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql}/bin/mysql_config" "--with-mysql=${mysql}/bin/mysql_config"
"--with-geotiff=${libgeotiff}" "--with-geotiff=${libgeotiff}"
"--with-python" # optional "--with-python" # optional
"--with-static-proj4=${proj}" # optional
]; ];
meta = { meta = {