public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qgis: Fix build after pythonPackages.sip update

Browse Source 
QGis seems to have a problem with recent sip releases. This patch fixes
the issue.
This commit is contained in:
Lancelot SIX 2017-03-13 16:05:31 +01:00
parent 5f64bb7903
commit 1375a2eecf
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/gis/qgis/default.nix
View File

@ -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 , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
, qjson, qca2, txt2tags, openssl , qjson, qca2, txt2tags, openssl
, withGrass ? false, grass , withGrass ? false, grass
@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ]; 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 # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
#enableParallelBuilding = true; #enableParallelBuilding = true;