Skip to content

Commit

Permalink
gdal: Fix darwin build
Browse files Browse the repository at this point in the history
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 OSGeo/gdal#573
  • Loading branch information
knedlsepp committed Jun 4, 2018
1 parent 2c92213 commit 13e3a21
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion 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
Expand All @@ -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 ])
Expand Down

0 comments on commit 13e3a21

Please sign in to comment.