@@ -1,8 +1,9 @@
11{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
22, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
33, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
4−, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
4+, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
55, withGrass ? true, grass
6+, withWebKit ? true, qtwebkit
67}:
78with lib;
89let
@@ -10,7 +11,7 @@ let
1011 [ qscintilla-qt5 gdal jinja2 numpy psycopg2
1112 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
1213in mkDerivation rec {
13− version = "3.10.11";
14+ version = "3.10.13";
1415 pname = "qgis";
1516 name = "${pname}-unwrapped-${version}";
1617
@@ -18,7 +19,7 @@ in mkDerivation rec {
1819 owner = "qgis";
1920 repo = "QGIS";
2021 rev = "final-${lib.replaceStrings ["."] ["_"] version}";
21− sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q";
22+ sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb";
2223 };
2324
2425 passthru = {
@@ -28,8 +29,10 @@ in mkDerivation rec {
2829
2930 buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
3031 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
31− qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
32− (lib.optional withGrass grass) ++ pythonBuildInputs;
32+ qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ]
33+ ++ lib.optional withGrass grass
34+ ++ lib.optional withWebKit qtwebkit
35+ ++ pythonBuildInputs;
3336
3437 nativeBuildInputs = [ cmake flex bison ninja ];
3538
@@ -44,17 +47,15 @@ in mkDerivation rec {
4447
4548 cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
4649 "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
47− "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++
48− lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
50+ "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ]
51+ ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
52+ ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
4953
5054 meta = {
5155 description = "A Free and Open Source Geographic Information System";
52− homepage = "http://www.qgis.org";
56+ homepage = "https://www.qgis.org";
5357 license = lib.licenses.gpl2Plus;
5458 platforms = with lib.platforms; linux;
55− maintainers = with lib.maintainers; [ lsix ];
56− # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit
57− # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
58− broken = true;
59+ maintainers = with lib.maintainers; [ lsix sikmir ];
5960 };
6061}