diff options
| author | Robin Gloster | 2016-02-27 00:08:08 +0000 |
|---|---|---|
| committer | Robin Gloster | 2016-02-27 00:08:08 +0000 |
| commit | 3477e662e60ba80a777f9126ba65ca6e9e0fcdf8 (patch) | |
| tree | 26aa99e97f980701131668a00a24fcb85c5cd8a8 /pkgs/development/libraries/gdal | |
| parent | b4dadff5429d0bf47bcdafff14dd3d0032039699 (diff) | |
| parent | 766ad682f146a755b460dd87006912a96d915bcd (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/gdal')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 582ab53800eb..829c395cc7be 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng }: +, libpng +, netcdf, hdf5 , curl +, netcdfSupport ? true + }: composableDerivation.composableDerivation {} (fixed: rec { - version = "2.0.1"; + version = "2.0.2"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab"; + sha256 = "db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] - ++ (with pythonPackages; [ python numpy wrapPython ]); + ++ (with pythonPackages; [ python numpy wrapPython ]) + ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]); hardening_format = false; @@ -38,6 +42,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-python" # optional "--with-static-proj4=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional + (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; # Prevent this: |