nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

qgis: 4.0.3 -> 4.2.1 (#548812)

Browse Source
This commit is contained in:
tomberek
2026-09-05 05:14:01 +00:00
committed by GitHub
parent 4c50747afe aea3015106
commit 8e71fc4eec
2 changed files with 12 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/gis/qgis/set-pyqt6-package-dirs.patch
View File

@@ -1,35 +0,0 @@
diff --git a/cmake/FindPyQt6.cmake b/cmake/FindPyQt6.cmake
index a938417a03f..b3a2d3cf091 100644
--- a/cmake/FindPyQt6.cmake
+++ b/cmake/FindPyQt6.cmake
@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT6_VERSION_STR)
IF(SIP_BUILD_EXECUTABLE)
# SIP >= 5.0 path
- FILE(GLOB _pyqt6_metadata "${Python_SITEARCH}/PyQt6-*.dist-info/METADATA")
+ FILE(GLOB _pyqt6_metadata "@pyQt6PackageDir@/[Pp]y[Qq]t6-*.dist-info/METADATA")
IF(_pyqt6_metadata)
FILE(READ ${_pyqt6_metadata} _pyqt6_metadata_contents)
STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT6_VERSION_STR ${_pyqt6_metadata_contents})
diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake
index f6a06ebd5b4..ca502d60fbd 100644
--- a/cmake/FindQsci.cmake
+++ b/cmake/FindQsci.cmake
@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR)
IF(SIP_BUILD_EXECUTABLE)
# SIP >= 5.0 path
- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA")
+ FILE(GLOB _qsci_metadata "@qsciPackageDir@/[Pp]y[Qq]t6[_-][Qq]scintilla*.dist-info/METADATA")
IF(_qsci_metadata)
FILE(READ ${_qsci_metadata} _qsci_metadata_contents)
STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents})
@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR)
ENDIF(_qsci_metadata)
IF(QSCI_MOD_VERSION_STR)
- SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}")
+ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt6/bindings")
SET(QSCI_FOUND TRUE)
ENDIF(QSCI_MOD_VERSION_STR)

25
pkgs/applications/gis/qgis/unwrapped.nix
View File

@@ -5,7 +5,6 @@
fetchFromGitHub,
lndir,
makeWrapper,
replaceVars,
wrapGAppsHook3,
wrapQtAppsHook,
@@ -89,16 +88,22 @@ let
in
stdenv.mkDerivation rec {
pname = "qgis-unwrapped";
version = "4.0.3";
version = "4.2.1";
outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-vHKDc+OeIVfi+7Gp1ROUDYon+wKb24Nr5nCVfmhknvc=";
hash = "sha256-tdZNSA6kZHwS96YRbN7YF+ODPJrnINa/QGCo8pw196I=";
};
postPatch = ''
substituteInPlace python/utils.py \
--replace-fail '("mod_spatialite", "sqlite3_modspatialite_init")' \
'("${libspatialite}/lib/mod_spatialite${stdenv.hostPlatform.extensions.sharedLibrary}", "sqlite3_modspatialite_init")'
'';
passthru = {
inherit pythonBuildInputs;
inherit py;
@@ -160,16 +165,6 @@ stdenv.mkDerivation rec {
]
++ pythonBuildInputs;
patches = [
(replaceVars ./set-pyqt6-package-dirs.patch {
pyQt6PackageDir = "${py.pkgs.pyqt6}/${py.pkgs.python.sitePackages}";
qsciPackageDir = "${py.pkgs.pyqt6-qscintilla}/${py.pkgs.python.sitePackages}";
})
(replaceVars ./spatialite-path.patch {
spatialiteLib = "${libspatialite}/lib/mod_spatialite${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
# Add path to Qt platform plugins
# (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py")
env.QT_QPA_PLATFORM_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}/platforms";
@@ -184,6 +179,10 @@ stdenv.mkDerivation rec {
# See https://github.com/libspatialindex/libspatialindex/issues/276
"-DWITH_INTERNAL_SPATIALINDEX=True"
"-DPYQT6_DIST_INFO=${py.pkgs.pyqt6}/${py.pkgs.python.sitePackages}/pyqt6-${py.pkgs.pyqt6.version}.dist-info"
"-DQSCI_DIST_INFO=${py.pkgs.pyqt6-qscintilla}/${py.pkgs.python.sitePackages}/pyqt6_qscintilla-${py.pkgs.pyqt6-qscintilla.version}.dist-info"
"-DQSCI_SIP_DIR=${py.pkgs.pyqt6-qscintilla}/${py.pkgs.python.sitePackages}/PyQt6/bindings"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DQGIS_MACAPP_BUNDLE=0"