From a0187a2a2107affa2d70a3e6346f43fb68f02555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 16 Sep 2024 13:53:28 -0600 Subject: [PATCH] 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 --- pkgs/desktops/plasma-5/default.nix | 3 +-- pkgs/desktops/plasma-5/plasma-pa.nix | 2 -- pkgs/top-level/qt5-packages.nix | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index b1fa8a7068a1fe5..20c7904f9c0abb9 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 0256461db94caa4..40a05ed6fe14f8e 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 2e746d5c7d5dba0..b0091a16f3dad38 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);