File tree Expand file tree Collapse file tree 2 files changed +7
-12
lines changed
pkgs/applications/gis/qgis Expand file tree Collapse file tree 2 files changed +7
-12
lines changed Original file line number Diff line number Diff line change @@ -11,16 +11,6 @@ index b51fd0075e..87ee317e05 100644
1111 IF(_pyqt5_metadata)
1212 FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents)
1313 STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents})
14- @@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR)
15- ENDIF(_pyqt5_metadata)
16-
17- IF(PYQT5_VERSION_STR)
18- - SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5")
19- - SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings")
20- + SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5")
21- + SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings")
22- FIND_PROGRAM(__pyuic5 "pyuic5")
23- GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY)
2414
2515diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake
2616index 69e41c1fe9..5456c3d59b 100644
Original file line number Diff line number Diff line change 8282 ] ;
8383in
8484mkDerivation rec {
85- version = "3.34.15 " ;
85+ version = "3.40.4 " ;
8686 pname = "qgis-ltr-unwrapped" ;
8787
8888 src = fetchFromGitHub {
8989 owner = "qgis" ;
9090 repo = "QGIS" ;
9191 rev = "final-${ lib . replaceStrings [ "." ] [ "_" ] version } " ;
92- hash = "sha256-TFnlQIizI+8CZgNpwkuipSCNT3OYIaOeoz6kIGcSYL4 =" ;
92+ hash = "sha256-R2/ycRPQVKqleSt+9D/YCpBlqKgJdhLc0BvYT7qFJo8 =" ;
9393 } ;
9494
9595 passthru = {
@@ -160,6 +160,11 @@ mkDerivation rec {
160160 "-DWITH_3D=True"
161161 "-DWITH_PDAL=True"
162162 "-DENABLE_TESTS=False"
163+ "-DQT_PLUGINS_DIR=${ qtbase } /${ qtbase . qtPluginPrefix } "
164+
165+ # Remove for QGIS 3.42
166+ "-DCMAKE_POLICY_DEFAULT_CMP0175=OLD"
167+ "-DCMAKE_POLICY_DEFAULT_CMP0177=OLD"
163168 ]
164169 ++ lib . optional ( ! withWebKit ) "-DWITH_QTWEBKIT=OFF"
165170 ++ lib . optional withServer [
You can’t perform that action at this time.
0 commit comments