diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-06-04 22:43:03 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-04 22:43:03 +0000 |
| commit | d1ebf508f508603fdc592f3ac12b1ad6b8d91849 (patch) | |
| tree | ffcc863741749f6df334ef210b052e7aa600ac91 /pkgs/development/libraries | |
| parent | 957810e04fa2bdaf2bb07471ad7f9bc4a2a66bf6 (diff) | |
| parent | 8414fa2d6bb1249ed77565ff6b9f312fd52917da (diff) | |
| download | nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.tar nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.tar.gz nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.tar.bz2 nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.tar.lz nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.tar.xz nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.tar.zst nixpkgs-d1ebf508f508603fdc592f3ac12b1ad6b8d91849.zip | |
Merge branch 'master' into staging
* master: Revert "vinagre: disable format hardening" nix: point at curl 7.59.0 (#41452) vinagre: disable format hardening linux: Add 4.17 gnome3.vinagre: fix build linux-copperhead: 4.16.12.a -> 4.16.13.a julia: add some version info to passthru, will be used by julia2nix gdal: Fix darwin build opendkim: fix libbsd dependency avoid redundant rm calls perlPackages.CPANPLUS: add cpanp dependency plotutils: fix parallel building nixos/gitea: Respect gitea-dump enable option. (#41437) kubernetes: corrected spelling mistake in docs (#41439) python.pkgs.trustme: fix python2 build revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly remove the temporary ssh host keys file/directory.
Diffstat (limited to 'pkgs/development/libraries')
| -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 ]) |