JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4228 from michelk/gdal

Browse Source 
gdal: update from 1.7.1 to 1.11.0
This commit is contained in:
Pascal Wittmann 2014-09-26 16:07:45 +02:00
commit ae2504f2c1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/gdal/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff }: , postgresql, mysql, libgeotiff, python, pythonPackages}:
composableDerivation.composableDerivation {} (fixed: { composableDerivation.composableDerivation {} (fixed: rec {
name = "gdal-1.7.1"; name = "gdal-1.11.0";
src = fetchurl { src = fetchurl {
url = ftp://ftp.remotesensing.org/gdal/gdal171.zip; url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz";
md5 = "f5592cff69b239166c9b64ff81943b1a"; md5 = "9fdf0f2371a3e9863d83e69951c71ec4";
}; };
buildInputs = [ unzip libjpeg libtiff ]; buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy];
# 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";
@ -22,6 +22,7 @@ composableDerivation.composableDerivation {} (fixed: {
"--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
]; ];
meta = { meta = {