diff options
| author | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2018-06-04 14:12:16 +0200 |
|---|---|---|
| committer | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2018-06-04 14:19:35 +0200 |
| commit | 13e3a21b5ca6122684daaf18aff3258fe5aa3a8d (patch) | |
| tree | 2f15331e4f1b8ef36db15e9b655d4e8bd1e9643b /pkgs/development/libraries/gdal/default.nix | |
| parent | 2c92213cd2bb38bcf1a74169f5f615f93df8c49c (diff) | |
| download | nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.tar nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.tar.gz nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.tar.bz2 nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.tar.lz nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.tar.xz nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.tar.zst nixpkgs-13e3a21b5ca6122684daaf18aff3258fe5aa3a8d.zip | |
gdal: Fix darwin build
This fixes: error: cannot initialize a variable of type 'GooString *' with an rvalue of type 'const GooString *' which occurs with recent clang or gcc-7. See https://github.com/OSGeo/gdal/pull/573
Diffstat (limited to 'pkgs/development/libraries/gdal/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 873d71d178b..e15f2583f4d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib +{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4 , libiconv @@ -16,6 +16,16 @@ stdenv.mkDerivation rec { 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 libspatialite poppler hdf4 ] ++ (with pythonPackages; [ python numpy wrapPython ]) |