mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
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
- 36d6eb9c2b
This commit is contained in:
parent
94de233834
commit
a0187a2a21
@ -28,7 +28,6 @@
|
|||||||
, lib
|
, lib
|
||||||
, config
|
, config
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, gconf
|
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -156,7 +155,7 @@ let
|
|||||||
plasma-mobile = callPackage ./plasma-mobile { };
|
plasma-mobile = callPackage ./plasma-mobile { };
|
||||||
plasma-nano = callPackage ./plasma-nano { };
|
plasma-nano = callPackage ./plasma-nano { };
|
||||||
plasma-nm = callPackage ./plasma-nm { };
|
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-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { };
|
||||||
plasma-sdk = callPackage ./plasma-sdk.nix { };
|
plasma-sdk = callPackage ./plasma-sdk.nix { };
|
||||||
plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
|
plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
, plasma-framework
|
, plasma-framework
|
||||||
, qtbase
|
, qtbase
|
||||||
, qtdeclarative
|
, qtdeclarative
|
||||||
, gconf
|
|
||||||
, glib
|
, glib
|
||||||
, libcanberra-gtk3
|
, libcanberra-gtk3
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
@ -22,7 +21,6 @@ mkDerivation {
|
|||||||
pname = "plasma-pa";
|
pname = "plasma-pa";
|
||||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gconf
|
|
||||||
glib
|
glib
|
||||||
libcanberra-gtk3
|
libcanberra-gtk3
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
|
@ -40,7 +40,6 @@ makeScopeWithSplicing' {
|
|||||||
attrs = {
|
attrs = {
|
||||||
inherit libsForQt5;
|
inherit libsForQt5;
|
||||||
inherit (pkgs) config lib fetchurl;
|
inherit (pkgs) config lib fetchurl;
|
||||||
gconf = pkgs.gnome2.GConf;
|
|
||||||
inherit (pkgs) gsettings-desktop-schemas;
|
inherit (pkgs) gsettings-desktop-schemas;
|
||||||
};
|
};
|
||||||
in (lib.makeOverridable mkPlasma5 attrs);
|
in (lib.makeOverridable mkPlasma5 attrs);
|
||||||
|
Loading…
Reference in New Issue
Block a user