git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #41445 from knedlsepp/fix-gdal-on-darwin

gdal: Fix darwin build

commitf19e64a0d286527f12c2995967305ed1f763a84e authorDaiderd Jordan <daiderd@gmail.com> dateMon 4 Jun 2018, 23:39 (8 years ago) parent90f5c5413e3a21
1 file changed+11−1
pkgs/development/libraries/gdal/default.nix+11−1
pkgs/development/libraries/gdal/default.nix+11−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
1+{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
22, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
33, libpng, sqlite, libspatialite, poppler, hdf4
44, libiconv
@@ -16,6 +16,16 @@ stdenv.mkDerivation rec {
1616 sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg";
1717 };
1818
19+ patches = [
20+ # fix build with recent Poppler
21+ (fetchpatch {
22+ url = "https://github.com/OSGeo/gdal/commit/124f0343436d1267319ac627fc220530091b41ea.diff";
23+ stripLen = 2;
24+ extraPrefix = "";
25+ sha256 = "1v6iiy4cgrdcfas3iva5swh9446pqfjh5p6bcab6y49hyjhpsgfy";
26+ })
27+ ];
28+
1929 buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
2030 libspatialite poppler hdf4 ]
2131 ++ (with pythonPackages; [ python numpy wrapPython ])