diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-08-02 10:57:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-02 10:57:25 +0200 |
commit | 0af0a20e1dddc2e993565d4e73c45bcddcf6ab74 (patch) | |
tree | 8a8658c77042da50cc46ad5e89618f5457df06af /pkgs/development | |
parent | 0d08b7d03cfdc8dd00545458e7a057d3ef4d3598 (diff) | |
parent | 6cf020fc29fa8a272e991e633e8372c424250e09 (diff) | |
download | nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.tar nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.tar.gz nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.tar.bz2 nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.tar.lz nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.tar.xz nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.tar.zst nixlib-0af0a20e1dddc2e993565d4e73c45bcddcf6ab74.zip |
Merge pull request #17140 from michelk/gdal/update
gdal: 2.0.2 -> 2.1.1
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 36019bdd7f71..f19f760c7487 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -6,24 +6,18 @@ }: composableDerivation.composableDerivation {} (fixed: rec { - version = "2.0.2"; + version = "2.1.1"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4"; + sha256 = "55fc6ffbe76e9d2e7e6cf637010e5d4bba6a966d065f40194ff798544198236b"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]); - patches = [ - # This ensures that the python package is installed into gdal's prefix, - # rather than trying to install into python's prefix. - ./python.patch - ]; - # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; |