diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-13 21:27:46 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-13 21:31:12 -0400 |
| commit | a99ef0345d3395294f85d8f80fc0967c8ddc740a (patch) | |
| tree | 2f1e513db6b4b44d0a59c5865a3287603ca087d8 | |
| parent | 2bc1a8f9e381e406411c442e91984721317e25ad (diff) | |
| download | nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.tar nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.tar.gz nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.tar.bz2 nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.tar.lz nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.tar.xz nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.tar.zst nixlib-a99ef0345d3395294f85d8f80fc0967c8ddc740a.zip | |
nixos/lightdm/pantheon: provide xgreeters in package
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 7 |
2 files changed, 8 insertions, 6 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 05011b999f2b..29cb6ccbc06b 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -8,11 +8,6 @@ let ldmcfg = dmcfg.lightdm; cfg = ldmcfg.greeters.pantheon; - xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{ - path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; - name = "io.elementary.greeter.desktop"; - }]; - in { options = { @@ -36,7 +31,7 @@ in services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = mkDefault { - package = xgreeters; + package = pkgs.pantheon.elementary-greeter.xgreeters; name = "io.elementary.greeter"; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 2e6cc24b486e..a72e0b6c223a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchFromGitHub +, linkFarm +, elementary-greeter , pantheon , pkgconfig , meson @@ -41,6 +43,11 @@ stdenv.mkDerivation rec { inherit repoName; attrPath = pname; }; + + xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ + path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; + name = "io.elementary.greeter.desktop"; + }]; }; nativeBuildInputs = [ |