dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

metacity: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-08-11 23:28:55 +02:00
parent 6dd20f8a64
commit f192bd9e5c
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -52,9 +52,9 @@ let
flashbackEnabled = cfg.flashback.enableMetacity || lib.length cfg.flashback.customSessions > 0;
flashbackWms = lib.optional cfg.flashback.enableMetacity {
wmName = "metacity";
wmName = "pkgs.metacity";
wmLabel = "Metacity";
wmCommand = "${pkgs.gnome.metacity}/bin/metacity";
wmCommand = "${pkgs.metacity}/bin/metacity";
enableGnomePanel = true;
} ++ cfg.flashback.customSessions;

6
nixos/modules/services/x11/window-managers/metacity.nix
View File

@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.xserver.windowManager.metacity;
inherit (pkgs) gnome;
inherit (pkgs) metacity;
in
{
@ -18,12 +18,12 @@ in
services.xserver.windowManager.session = singleton
{ name = "metacity";
start = ''
${gnome.metacity}/bin/metacity &
${metacity}/bin/metacity &
waitPID=$!
'';
};
environment.systemPackages = [ gnome.metacity ];
environment.systemPackages = [ metacity ];
};

0
pkgs/desktops/gnome/misc/metacity/fix-paths.patch → pkgs/by-name/me/metacity/fix-paths.patch
View File

1
pkgs/desktops/gnome/misc/metacity/default.nix → pkgs/by-name/me/metacity/package.nix
View File

@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = "metacity";
attrPath = "gnome.metacity";
versionPolicy = "odd-unstable";
};
};

3
pkgs/desktops/gnome/default.nix
View File

@ -77,8 +77,6 @@ in
gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { };
metacity = callPackage ./misc/metacity { };
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; };
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
@ -157,6 +155,7 @@ in
hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11.
iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11.
lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11.
metacity = lib.warn "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly." pkgs.metacity; # Added on 2024-08-11.
nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.
nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.
polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11.