alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #142273 from ju1m/display-managers

Browse source
This commit is contained in:
Artturi 2021-10-23 03:58:21 +03:00 committed by GitHub
parent 8b5982c9a7 2ef7fec214
commit dfad31d753
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/display-managers/default.nix
View file

@ -122,10 +122,10 @@ let
done
if test -d ${pkg}/share/xsessions; then
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
fi
if test -d ${pkg}/share/wayland-sessions; then
${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
fi
'') cfg.displayManager.sessionPackages}
'';

2
nixos/modules/system/boot/systemd-lib.nix
View file

@ -4,7 +4,7 @@ with lib;
let
cfg = config.systemd;
lndir = "${pkgs.xorg.lndir}/bin/lndir";
lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir";
in rec {
shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);