From a1c4a5b894afc4aeccab1345c514e153413c5526 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 11 Nov 2021 16:52:57 +0800 Subject: [PATCH] pantheon.elementary-default-settings: cleanup --- .../desktop/elementary-default-settings/default.nix | 12 ++---------- .../io.elementary.greeter.allowed | 6 ------ 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-default-settings/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 c5ccba962e44..7b0ea248ed61 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -58,20 +58,12 @@ stdenv.mkDerivation rec { # Our launchers that use paths at /run/current-system/sw/bin mkdir -p $out/etc/skel/.config/plank/dock1 cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers - - # Whitelist wingpanel indicators to be used in the greeter - # https://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 = '' # https://github.com/elementary/default-settings/issues/55 - rm -rf $out/share/plymouth - rm -rf $out/share/cups - - rm -rf $out/share/applications + rm -r $out/share/cups + rm -r $out/share/applications ''; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed b/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed deleted file mode 100644 index 0cff31f4f777..000000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed +++ /dev/null @@ -1,6 +0,0 @@ -liba11y.so -libbluetooth.so -libkeyboard.so -libnetwork.so -libpower.so -libsession.so