BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #41445 from knedlsepp/fix-gdal-on-darwin

Browse source 
gdal: Fix darwin build
This commit is contained in:
Daiderd Jordan 2018-06-04 23:39:14 +02:00 committed by GitHub
commit f19e64a0d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/gdal/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, 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
, libiconv , libiconv
@ -16,6 +16,16 @@ stdenv.mkDerivation rec {
sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg";
}; };
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 ]
++ (with pythonPackages; [ python numpy wrapPython ]) ++ (with pythonPackages; [ python numpy wrapPython ])