diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2019-01-19 15:42:58 +0100 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2019-01-19 15:42:58 +0100 |
| commit | d2f39adea91aa8d682a7c3b06a08ff0050781d21 (patch) | |
| tree | 0c57921125984bb3c9898ff16ecdbde74d34d695 /pkgs/development/libraries/gdal/default.nix | |
| parent | 6f8e0ae6087c4062dea5ea9ba055264be08dd869 (diff) | |
| download | nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.tar nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.tar.gz nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.tar.bz2 nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.tar.lz nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.tar.xz nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.tar.zst nixpkgs-d2f39adea91aa8d682a7c3b06a08ff0050781d21.zip | |
gdal: fix build with poppler 0.73
Diffstat (limited to 'pkgs/development/libraries/gdal/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index d8ae037db84..98ec9f2960e 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -51,6 +51,20 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + + # poppler 0.73.0 support + patch -lp2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; + sha256 = "0xaxj0nj7j8prw1xrdwqs2in9iwyizqprpaibfbhjmsanyl2lfsx"; + } + } || true + patch -p2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; + sha256 = "0jmdkyzlw0rcv4apcaki6pszcb1dca3lljy06sjh60yh795wlqd6"; + } + } ''; # - Unset CC and CXX as they confuse libtool. |