diff options
| author | Artturin | 2024-06-28 18:59:28 +0300 |
|---|---|---|
| committer | GitHub | 2024-06-28 18:59:28 +0300 |
| commit | 560adbb16d9ba7f46160cee7c126309414fd5d98 (patch) | |
| tree | 02f7e8dbbc09c0c0fbe047b498b4c2f47c3c80eb /pkgs | |
| parent | ccda0049f21ebc94f8819f0c187a4b738d232ab0 (diff) | |
| parent | 8bd8c7d4f25713f5f2218d72deb48dc77c4ce31d (diff) | |
Merge pull request #321562 from imincik/qgis-3.34.8
qgis-ltr: 3.34.7 -> 3.34.8
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped-ltr.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index aa313fef857c..351529415025 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -77,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.7"; + version = "3.34.8"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6fIBmIoCVo0AtkjC4Vn3jMjz93gZmvkFAgo+KnasyXo="; + hash = "sha256-UeyGx+C7szXv++hXFV006Xk4oSKfSj4teJIwaD4ODVk="; }; passthru = { @@ -147,9 +147,7 @@ in mkDerivation rec { # Add path to Qt platform plugins # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") - preBuild = '' - export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms - ''; + env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -164,7 +162,7 @@ in mkDerivation rec { ); qtWrapperArgs = [ - "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms" ]; dontWrapGApps = true; # wrapper params passed below |