nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 11:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cinnamon-screensaver: Move from cinnamon scope to top-level

Browse Source
This commit is contained in:
Bobby Rong 2024-07-22 23:51:10 +08:00
parent d1a7acfc47
commit ab6606dfb8
No known key found for this signature in database
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ in
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.dbus.packages = with pkgs; [
cinnamon-common
cinnamon.cinnamon-screensaver
cinnamon-screensaver
nemo-with-extensions
xapp
];
@ -148,7 +148,7 @@ in
killall
# session requirements
cinnamon.cinnamon-screensaver
cinnamon-screensaver
# cinnamon-killer-daemon: provided by cinnamon-common
networkmanagerapplet # session requirement - also nm-applet not needed

0
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix → pkgs/by-name/ci/cinnamon-screensaver/package.nix
View File

2
pkgs/desktops/cinnamon/default.nix
View File

@ -2,7 +2,6 @@
lib.makeScope pkgs.newScope (self: with self; {
cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
}) // lib.optionalAttrs config.allowAliases {
# Aliases need to be outside the scope or they will shadow the attributes from parent scope.
bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
@ -10,6 +9,7 @@ lib.makeScope pkgs.newScope (self: with self; {
cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22
cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
cinnamon-screensaver = lib.warn "cinnamon.cinnamon-screensaver was moved to top-level. Please use pkgs.cinnamon-screensaver directly." pkgs.cinnamon-screensaver; # Added on 2024-07-22
cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22
cinnamon-settings-daemon = lib.warn "cinnamon.cinnamon-settings-daemon was moved to top-level. Please use pkgs.cinnamon-settings-daemon directly." pkgs.cinnamon-settings-daemon; # Added on 2024-07-22
cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22