diff options
author | vbgl <vbgl@users.noreply.github.com> | 2014-12-15 13:36:32 +0100 |
---|---|---|
committer | vbgl <vbgl@users.noreply.github.com> | 2014-12-15 13:36:32 +0100 |
commit | fed9a36f74d622f625ae097fa5611f30ed83074f (patch) | |
tree | 1e7990dc0aea082c784939b192e7c7db42110ef0 | |
parent | 1a504e3fb72fab10799cf07ba8eaa942bb7e585b (diff) | |
parent | e65bd08b32207b8842ccab377c09dc286c4dcd5a (diff) | |
download | nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.tar nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.tar.gz nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.tar.bz2 nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.tar.lz nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.tar.xz nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.tar.zst nixlib-fed9a36f74d622f625ae097fa5611f30ed83074f.zip |
Merge pull request #5296 from michelk/gdal-1.11.1
gdal: update to 1.11.1 and compiling with proj
-rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index c397013750ba..76c896d64ddf 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages}: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj}: composableDerivation.composableDerivation {} (fixed: rec { - name = "gdal-1.11.0"; + version = "1.11.1"; + name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz"; - md5 = "9fdf0f2371a3e9863d83e69951c71ec4"; + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + 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 preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; configureFlags = [ "--with-jpeg=${libjpeg}" - "--with-libtiff=${libtiff}" # optional (without largetiff support - "--with-libz=${zlib}" # optional + "--with-libtiff=${libtiff}" # optional (without largetiff support + "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" - "--with-python" # optional + "--with-python" # optional + "--with-static-proj4=${proj}" # optional ]; meta = { |