diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-21 22:19:40 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-22 01:15:09 -0500 |
| commit | 94af8ebde202bf2f0117cf4d5a1d78f75032448a (patch) | |
| tree | 431a611c9b72c86510e217baa0c23445835c02cf /nixos/modules | |
| parent | 48d08bea5a837a3b148011c4eccfc9fc5a7599f9 (diff) | |
| download | nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.tar nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.tar.gz nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.tar.bz2 nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.tar.lz nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.tar.xz nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.tar.zst nixpkgs-94af8ebde202bf2f0117cf4d5a1d78f75032448a.zip | |
nixos/displayManager: only install wayland sessions if they exist in extraSessionFilePackages
Not everyone is using wayland just yet.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 035029150c8..047321bd949 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -194,9 +194,12 @@ let ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions '') cfg.displayManager.extraSessionFilePackages} - mkdir -p "$out/share/wayland-sessions" + ${concatMapStrings (pkg: '' - ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions + if test -d ${pkg}/share/wayland-sessions; then + mkdir -p "$out/share/wayland-sessions" + ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions + fi '') cfg.displayManager.extraSessionFilePackages} ''; |