gnome-panel: Move from gnome scope to top-level
This commit is contained in:
parent
771f47b485
commit
e1093690a8
@ -166,7 +166,7 @@ in
|
||||
defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";
|
||||
type = types.listOf types.package;
|
||||
description = ''
|
||||
Packages containing modules that should be made available to `gnome-panel` (usually for applets).
|
||||
Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets).
|
||||
|
||||
If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`.
|
||||
'';
|
||||
@ -243,7 +243,7 @@ in
|
||||
|
||||
environment.systemPackages = with pkgs.gnome; [
|
||||
gnome-flashback
|
||||
(gnome-panel-with-modules.override {
|
||||
(pkgs.gnome-panel-with-modules.override {
|
||||
panelModulePackages = cfg.flashback.panelModulePackages;
|
||||
})
|
||||
]
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib
|
||||
, desktopSupport ? "gnomeflashback", xorg
|
||||
, gtk2
|
||||
, gtk3, gnome, mate
|
||||
, gtk3, gnome-panel, mate
|
||||
, libxfce4util, xfce4-panel
|
||||
}:
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
|
||||
++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ]
|
||||
++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ]
|
||||
++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
|
||||
++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
|
||||
;
|
||||
|
@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-panel";
|
||||
attrPath = "gnome.gnome-panel";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
@ -3,6 +3,7 @@
|
||||
lib,
|
||||
buildEnv,
|
||||
gnome,
|
||||
gnome-panel,
|
||||
xorg,
|
||||
glib,
|
||||
wrapGAppsHook3,
|
||||
@ -10,7 +11,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (gnome) gnome-panel gnome-flashback;
|
||||
inherit (gnome) gnome-flashback;
|
||||
|
||||
# We always want to find the built-in panel applets.
|
||||
selectedPanelModulePackages = [
|
@ -51,10 +51,6 @@ in
|
||||
|
||||
gnome-flashback = callPackage ./misc/gnome-flashback { };
|
||||
|
||||
gnome-panel = callPackage ./misc/gnome-panel { };
|
||||
|
||||
gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { };
|
||||
|
||||
}) // lib.optionalAttrs config.allowAliases {
|
||||
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
||||
libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
|
||||
@ -114,6 +110,8 @@ in
|
||||
gnome-nibbles = lib.warn "The ‘gnome.gnome-nibbles’ was moved to top-level. Please use ‘pkgs.gnome-nibbles’ directly." pkgs.gnome-nibbles; # Added on 2024-08-11.
|
||||
gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11.
|
||||
gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
|
||||
gnome-panel = lib.warn "The ‘gnome.gnome-panel’ was moved to top-level. Please use ‘pkgs.gnome-panel’ directly." pkgs.gnome-panel; # Added on 2024-08-31.
|
||||
gnome-panel-with-modules = lib.warn "The ‘gnome.gnome-panel-with-modules’ was moved to top-level. Please use ‘pkgs.gnome-panel-with-modules’ directly." pkgs.gnome-panel-with-modules; # Added on 2024-08-31.
|
||||
gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11.
|
||||
gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
|
||||
gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
|
||||
|
@ -8149,6 +8149,8 @@ with pkgs;
|
||||
|
||||
gnome-solanum = callPackage ../applications/misc/gnome-solanum { };
|
||||
|
||||
gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { };
|
||||
|
||||
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
|
||||
|
||||
gnome-photos = callPackage ../applications/graphics/gnome-photos { };
|
||||
|
Loading…
Reference in New Issue
Block a user