gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cinnamon-gsettings-overrides: Move from cinnamon scope to top-level

Browse Source
This commit is contained in:
Bobby Rong
2024-07-23 22:12:42 +08:00
parent ab6606dfb8
commit 22b54a6e7f
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/x11/desktop-managers/cinnamon.nix
+1 -1
View File
@@ -7,7 +7,7 @@ let
cfg = config.services.xserver.desktopManager.cinnamon;
serviceCfg = config.services.cinnamon;
nixos-gsettings-overrides = pkgs.cinnamon.cinnamon-gsettings-overrides.override {
nixos-gsettings-overrides = pkgs.cinnamon-gsettings-overrides.override {
extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
};
pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix → pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
View File
pkgs/desktops/cinnamon/default.nix
+2 -3
View File
@@ -1,13 +1,12 @@
{ config, pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; {
cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
}) // lib.optionalAttrs config.allowAliases {
lib.makeScope pkgs.newScope (self: { }) // 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
cinnamon-common = lib.warn "cinnamon.cinnamon-common was moved to top-level. Please use pkgs.cinnamon-common directly." pkgs.cinnamon-common; # Added on 2024-07-22
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-gsettings-overrides = lib.warn "cinnamon.cinnamon-gsettings-overrides was moved to top-level. Please use pkgs.cinnamon-gsettings-overrides directly." pkgs.cinnamon-gsettings-overrides; # 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