diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-08-09 02:26:57 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-08-09 02:26:57 +0000 |
commit | e6a3e4706a7ad368528988052c2eb4ea7dd058e4 (patch) | |
tree | 72f0afc5ca4afd9e27ef9750ddaf85a08e9feef3 /pkgs | |
parent | 6fd962ed335577829031acd281cc061612759e66 (diff) | |
download | nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.tar nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.tar.gz nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.tar.bz2 nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.tar.lz nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.tar.xz nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.tar.zst nixpkgs-e6a3e4706a7ad368528988052c2eb4ea7dd058e4.zip |
gdal: 2.3.0 -> 2.3.1
qhull and giflib are added to build inputs to unbundle them, otherwise gdal uses internal copies.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 813ea050465..745e527658c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler, hdf4 +, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib , libiconv , netcdfSupport ? true, netcdf, hdf5 , curl }: @@ -8,26 +8,16 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.0"; name = "gdal-${version}"; + version = "2.3.1"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; + sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw"; }; - patches = [ - # fix build with recent Poppler - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/124f0343436d1267319ac627fc220530091b41ea.diff"; - stripLen = 2; - extraPrefix = ""; - sha256 = "1v6iiy4cgrdcfas3iva5swh9446pqfjh5p6bcab6y49hyjhpsgfy"; - }) - ]; - buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 ] + libspatialite poppler hdf4 qhull giflib ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; @@ -44,7 +34,7 @@ stdenv.mkDerivation rec { "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" "--with-python" # optional - "--with-static-proj4=${proj}" # optional + "--with-proj4=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional "--with-hdf4=${hdf4.dev}" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") |