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

gdal: 2.3.0 -> 2.3.1

Browse Source 
qhull and giflib are added to build inputs to unbundle them, otherwise gdal uses
internal copies.
This commit is contained in:
Orivej Desh 2018-08-09 02:26:57 +00:00
parent 6fd962ed33
commit e6a3e4706a
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib
, libiconv , libiconv
, netcdfSupport ? true, netcdf, hdf5 , curl , netcdfSupport ? true, netcdf, hdf5 , curl
}: }:
@ -8,26 +8,16 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.3.0";
name = "gdal-${version}"; name = "gdal-${version}";
version = "2.3.1";
src = fetchurl { src = fetchurl {
url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; 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 buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
libspatialite poppler hdf4 ] libspatialite poppler hdf4 qhull giflib ]
++ (with pythonPackages; [ python numpy wrapPython ]) ++ (with pythonPackages; [ python numpy wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optional stdenv.isDarwin libiconv
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
@ -44,7 +34,7 @@ stdenv.mkDerivation rec {
"--with-sqlite3=${sqlite.dev}" "--with-sqlite3=${sqlite.dev}"
"--with-spatialite=${libspatialite}" "--with-spatialite=${libspatialite}"
"--with-python" # optional "--with-python" # optional
"--with-static-proj4=${proj}" # optional "--with-proj4=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional "--with-geos=${geos}/bin/geos-config"# optional
"--with-hdf4=${hdf4.dev}" # optional "--with-hdf4=${hdf4.dev}" # optional
(if netcdfSupport then "--with-netcdf=${netcdf}" else "") (if netcdfSupport then "--with-netcdf=${netcdf}" else "")