pyrox.dev
Merge pull request #264871 from imincik/qgis-3.34.0
qgis: 3.32.3 -> 3.34.0
authored by
Nikolay Korotkiy
and committed by
GitHub
868874a0
187c04f1
+7
-10
pkgs/applications/gis/qgis/unwrapped.nix
+7
-10
pkgs/applications/gis/qgis/unwrapped.nix
···
1
1
{ lib
2
2
, fetchFromGitHub
3
-
, fetchpatch
4
3
, makeWrapper
5
4
, mkDerivation
6
5
, substituteAll
···
12
11
13
12
, bison
14
13
, cmake
14
+
, draco
15
15
, exiv2
16
16
, fcgi
17
17
, flex
···
64
64
owslib
65
65
psycopg2
66
66
pygments
67
-
pyqt-builder
68
67
pyqt5
68
+
pyqt-builder
69
69
python-dateutil
70
70
pytz
71
71
pyyaml
···
77
77
urllib3
78
78
];
79
79
in mkDerivation rec {
80
-
version = "3.32.3";
80
+
version = "3.34.0";
81
81
pname = "qgis-unwrapped";
82
82
83
83
src = fetchFromGitHub {
84
84
owner = "qgis";
85
85
repo = "QGIS";
86
86
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
87
-
hash = "sha256-ge5ne22sDLKbrJk2vYQxpu3iRXSoOk9924c/RdtD3Nc=";
87
+
hash = "sha256-+Yzp8kfd7cfxTwsrxRo+6uS+2Aj4HfKA2E8hSf7htsU=";
88
88
};
89
89
90
90
passthru = {
···
104
104
];
105
105
106
106
buildInputs = [
107
+
draco
107
108
exiv2
108
109
fcgi
109
110
geos
···
142
143
pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}";
143
144
qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}";
144
145
})
145
-
(fetchpatch {
146
-
name = "exiv2-0.28.patch";
147
-
url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch";
148
-
hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14=";
149
-
})
150
146
];
151
147
152
148
# Add path to Qt platform plugins
···
156
152
'';
157
153
158
154
cmakeFlags = [
155
+
"-DCMAKE_BUILD_TYPE=Release"
159
156
"-DWITH_3D=True"
160
-
"-DWITH_PDAL=TRUE"
157
+
"-DWITH_PDAL=True"
161
158
"-DENABLE_TESTS=False"
162
159
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
163
160
++ lib.optional withGrass (let