diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-07 10:52:14 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-07 11:35:21 -0400 |
| commit | eb3c53b4e9adb5668b6cd947e054699dad7ef5ac (patch) | |
| tree | 0ceff729db0cc9296697cb028fbf8c5703052537 | |
| parent | 8557cc77ede2726964ef3561ae5a59b55f3624ff (diff) | |
| download | nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.tar nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.tar.gz nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.tar.bz2 nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.tar.lz nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.tar.xz nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.tar.zst nixpkgs-eb3c53b4e9adb5668b6cd947e054699dad7ef5ac.zip | |
nixos/pantheon: update greeter whitelist to new wording
This was a simple non fatal deprecation. https://github.com/elementary/wingpanel/pull/326
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed (renamed from pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist) | 0 |
3 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 087c6b9c38a..9bc9e2bf616 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -43,7 +43,7 @@ in services.xserver.displayManager.lightdm.extraSeatDefaults = "greeter-show-manual-login=true"; environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf"; - environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist"; + environment.etc."wingpanel.d/io.elementary.greeter.allowed".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.allowed"; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 3215c001a5e..91755b5a226 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -83,8 +83,10 @@ stdenv.mkDerivation rec { cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers # Whitelist wingpanel indicators to be used in the greeter - # TODO: is this needed or installed upstream? - install -D ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist + # hhttps://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist + # wingpanel 2.3.2 renamed this to .allowed to .forbidden + # https://github.com/elementary/wingpanel/pull/326 + install -D ${./io.elementary.greeter.allowed} $out/etc/wingpanel.d/io.elementary.greeter.allowed ''; postFixup = '' diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist b/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed index 0cff31f4f77..0cff31f4f77 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed |