gdal_2: fix build (#169738)
* gdal_2: fix build * gdal_2: remove broken flag
This commit is contained in:
parent
4427d9cd73
commit
738d1454fe
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib
|
{ lib, stdenv, fetchurl, fetchpatch, libjpeg, libtiff, zlib
|
||||||
, postgresql, libmysqlclient, libgeotiff, python3Packages, proj, geos, openssl
|
, postgresql, libmysqlclient, libgeotiff, python3Packages, proj, geos, openssl
|
||||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||||
, libiconv, libxml2
|
, libiconv, libxml2
|
||||||
|
@ -16,6 +16,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
|
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/OSGeo/gdal/commit/7a18e2669a733ebe3544e4f5c735fd4d2ded5fa3.patch";
|
||||||
|
sha256 = "sha256-rBgIxJcgRzZR1gyzDWK/Sh7MdPWeczxEYVELbYEV8JY=";
|
||||||
|
relative = "gdal";
|
||||||
|
# this doesn't apply correctly because of line endings
|
||||||
|
excludes = [ "third_party/LercLib/Lerc2.h" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
||||||
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
||||||
++ (with python3Packages; [ python numpy wrapPython ])
|
++ (with python3Packages; [ python numpy wrapPython ])
|
||||||
|
@ -78,6 +88,5 @@ stdenv.mkDerivation rec {
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = [ lib.maintainers.marcweber ];
|
maintainers = [ lib.maintainers.marcweber ];
|
||||||
platforms = with lib.platforms; linux ++ darwin;
|
platforms = with lib.platforms; linux ++ darwin;
|
||||||
broken = stdenv.isLinux; #r2000.cpp:824:13: error: expected primary-expression before '}' token
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue