From cc513677183892c157802f8579917263a08a49e0 Mon Sep 17 00:00:00 2001 From: hqurve <hqurve@outlook.com> Date: Sun, 1 Jan 2023 20:19:03 -0400 Subject: [PATCH] qgis, qgis-ltr: disable qtwebkit by default qtwebkit has been marked has having known vulnerabilities. Since qtlocation was propagated by qtwebkit, it now needs to be explicitly added. See also: https://github.com/archlinux/svntogit-community/commit/783d52696588264257eed9d32c9fd212d0fdeace --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 +++- pkgs/applications/gis/qgis/unwrapped.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e11df27ab6c3..39720283057f 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9f445facb167..d8af75375697 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d