about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-11 07:11:04 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-18 11:13:43 -0400
commit5669b062356b5d5b8019ecc706a70d75ec30da0f (patch)
treeeb40b9b2f739c685c25f45b3ac88a00fc2e7bd0b
parent6d7687871e5d5efc2cd706ab39e4c86f14842084 (diff)
downloadnixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.tar
nixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.tar.gz
nixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.tar.bz2
nixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.tar.lz
nixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.tar.xz
nixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.tar.zst
nixlib-5669b062356b5d5b8019ecc706a70d75ec30da0f.zip
lightdm-mini-greeter: put xgreeters in passthru
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix7
-rw-r--r--pkgs/applications/display-managers/lightdm-mini-greeter/default.nix5
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index ba8151a60f20..fa9445af32e7 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -8,11 +8,6 @@ let
   ldmcfg = dmcfg.lightdm;
   cfg = ldmcfg.greeters.mini;
 
-  xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{
-    path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop";
-    name = "lightdm-mini-greeter.desktop";
-  }];
-
   miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf"
     ''
     [greeter]
@@ -90,7 +85,7 @@ in
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
     services.xserver.displayManager.lightdm.greeter = mkDefault {
-      package = xgreeters;
+      package = pkgs.lightdm-mini-greeter.xgreeters;
       name = "lightdm-mini-greeter";
     };
 
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index ad2ac58a8b6e..b5b26d7cc430 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
       --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter"
   '';
 
+  passthru.xgreeters = linkFarm "lightdm-mini-greeter-xgreeters" [{
+    path = "${lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop";
+    name = "lightdm-mini-greeter.desktop";
+  }];
+
   meta = with stdenv.lib; {
     description = "A minimal, configurable, single-user GTK3 LightDM greeter";
     homepage = https://github.com/prikhi/lightdm-mini-greeter;