nixos/displayManager: check for provided sessions in mkDesktops

This commit is contained in:
Tor Hedin Brønner 2019-01-12 08:43:24 +01:00 committed by Jan Tojnar
parent dd7144b860
commit 58e5290fce
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4

View file

@ -191,13 +191,18 @@ let
'') names}
${concatMapStrings (pkg: ''
for n in ${concatStringsSep " " pkg.providedSessions}; do
if ! test -f ${pkg}/share/wayland-sessions/$n.desktop -o \
-f ${pkg}/share/xsessions/$n.desktop; then
echo "Couldn't find provided session name, $n.desktop, in session package ${pkg.name}:"
echo " ${pkg}"
return 1
fi
done
if test -d ${pkg}/share/xsessions; then
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
fi
'') cfg.displayManager.sessionPackages}
${concatMapStrings (pkg: ''
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