about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFabián Heredia Montiel <fabianhjr@protonmail.com>2024-09-16 13:53:28 -0600
committerFabián Heredia Montiel <fabianhjr@protonmail.com>2024-09-16 13:54:58 -0600
commita0187a2a2107affa2d70a3e6346f43fb68f02555 (patch)
tree2da0e34767098b9b48751030d238a2f244df3188 /pkgs
parent94de23383494ead715a1a26b573cf8fefa7b1e32 (diff)
plasma-pa: drop GConf dependency
Removed from upsteam at 5.24.90/5.25.0

Sources:
- https://invent.kde.org/plasma/plasma-pa/-/merge_requests/117
- https://invent.kde.org/plasma/plasma-pa/-/commit/36d6eb9c2bac53cc6653b4aa45a1ac42f0ce68c7
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/desktops/plasma-5/default.nix3
-rw-r--r--pkgs/desktops/plasma-5/plasma-pa.nix2
-rw-r--r--pkgs/top-level/qt5-packages.nix1
3 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index b1fa8a7068a1f..20c7904f9c0ab 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -28,7 +28,6 @@
 , lib
 , config
 , fetchurl
-, gconf
 , gsettings-desktop-schemas
 }:
 
@@ -156,7 +155,7 @@ let
       plasma-mobile = callPackage ./plasma-mobile { };
       plasma-nano = callPackage ./plasma-nano { };
       plasma-nm = callPackage ./plasma-nm { };
-      plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+      plasma-pa = callPackage ./plasma-pa.nix { };
       plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { };
       plasma-sdk = callPackage ./plasma-sdk.nix { };
       plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 0256461db94ca..40a05ed6fe14f 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -11,7 +11,6 @@
 , plasma-framework
 , qtbase
 , qtdeclarative
-, gconf
 , glib
 , libcanberra-gtk3
 , libpulseaudio
@@ -22,7 +21,6 @@ mkDerivation {
   pname = "plasma-pa";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    gconf
     glib
     libcanberra-gtk3
     libpulseaudio
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 2e746d5c7d5db..b0091a16f3dad 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -40,7 +40,6 @@ makeScopeWithSplicing' {
     attrs = {
       inherit libsForQt5;
       inherit (pkgs) config lib fetchurl;
-      gconf = pkgs.gnome2.GConf;
       inherit (pkgs) gsettings-desktop-schemas;
     };
   in (lib.makeOverridable mkPlasma5 attrs);