diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-03-13 22:06:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 22:06:52 +0100 |
| commit | 9494820dbb2b7321ec07b48fb0b7b20e6d4809b8 (patch) | |
| tree | ec779a2ef2942989c5f96aff055b9cd25f843e94 | |
| parent | 369230cc760816fd2d7931bf05aac372b6bdea5a (diff) | |
| parent | 1375a2eecf52dc6f4fe61a52b9beadc1ffbc5dc6 (diff) | |
| download | nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.tar nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.tar.gz nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.tar.bz2 nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.tar.lz nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.tar.xz nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.tar.zst nixlib-9494820dbb2b7321ec07b48fb0b7b20e6d4809b8.zip | |
Merge pull request #23847 from lsix/fix-qgis
qgis: Fix build after pythonPackages.sip update
| -rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 004d11fe1575..d7dbaeb1fc21 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl , withGrass ? false, grass @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; + patches = [ + # See https://hub.qgis.org/issues/16071 + (fetchpatch { + name = "fix-build-against-recent-sip"; + url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch"; + sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30"; + }) + ]; + # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory #enableParallelBuilding = true; |