git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/lightdm/pantheon: provide xgreeters in package
commita99ef0345d3395294f85d8f80fc0967c8ddc740a authorworldofpeace <worldofpeace@protonmail.ch> dateFri 13 Sep 2019, 21:27 (7 years ago) parent2bc1a8f
2 files changed+8−6
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+1−6 pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix+7
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+1−6
@@ -8,11 +8,6 @@ let
88 ldmcfg = dmcfg.lightdm;
99 cfg = ldmcfg.greeters.pantheon;
1010
11− xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{
12− path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
13− name = "io.elementary.greeter.desktop";
14− }];
15−
1611in
1712{
1813 options = {
@@ -36,7 +31,7 @@ in
3631 services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
3732
3833 services.xserver.displayManager.lightdm.greeter = mkDefault {
39− package = xgreeters;
34+ package = pkgs.pantheon.elementary-greeter.xgreeters;
4035 name = "io.elementary.greeter";
4136 };
4237
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix+7
@@ -1,5 +1,7 @@
11{ stdenv
22, fetchFromGitHub
3+, linkFarm
4+, elementary-greeter
35, pantheon
46, pkgconfig
57, meson
@@ -41,6 +43,11 @@ stdenv.mkDerivation rec {
4143 inherit repoName;
4244 attrPath = pname;
4345 };
46+
47+ xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
48+ path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
49+ name = "io.elementary.greeter.desktop";
50+ }];
4451 };
4552
4653 nativeBuildInputs = [