git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145465 from bobby285271/pantheon

pantheon.elementary-default-settings: cleanup

commita1a665ffc227e7af16e61c18e1358a3e62e1ea73 authorBobby Rong <rjl931189261@126.com> dateThu 11 Nov 2021, 19:26 (5 years ago) parent592d84ba1c4a5b
2 files changed+2−16
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix+2−10 pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed−6
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix+2−10
@@ -58,20 +58,12 @@ stdenv.mkDerivation rec {
5858 # Our launchers that use paths at /run/current-system/sw/bin
5959 mkdir -p $out/etc/skel/.config/plank/dock1
6060 cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers
61−
62− # Whitelist wingpanel indicators to be used in the greeter
63− # https://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist
64− # wingpanel 2.3.2 renamed this to .allowed to .forbidden
65− # https://github.com/elementary/wingpanel/pull/326
66− install -D ${./io.elementary.greeter.allowed} $out/etc/wingpanel.d/io.elementary.greeter.allowed
6761 '';
6862
6963 postFixup = ''
7064 # https://github.com/elementary/default-settings/issues/55
71− rm -rf $out/share/plymouth
72− rm -rf $out/share/cups
73−
74− rm -rf $out/share/applications
65+ rm -r $out/share/cups
66+ rm -r $out/share/applications
7567 '';
7668
7769 passthru = {
pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.alloweddeleted−6
@@ -1,6 +0,0 @@
1−liba11y.so
2−libbluetooth.so
3−libkeyboard.so
4−libnetwork.so
5−libpower.so
6−libsession.so