Merge pull request #142273 from ju1m/display-managers
commitdfad31d753eccdd592850adf2599d132236b63cf
authorArtturi <Artturin@artturin.com>
dateSat 23 Oct 2021, 03:58 (5 years ago)
parent8b5982c2ef7fec
nixos/modules/services/x11/display-managers/default.nix+2−2
@@ -122,10 +122,10 @@ let
122122 done
123123
124124 if test -d ${pkg}/share/xsessions; then
125− ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
125+ ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
126126 fi
127127 if test -d ${pkg}/share/wayland-sessions; then
128− ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
128+ ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
129129 fi
130130 '') cfg.displayManager.sessionPackages}
131131 '';
nixos/modules/system/boot/systemd-lib.nix+1−1
@@ -4,7 +4,7 @@ with lib;
44
55let
66 cfg = config.systemd;
7− lndir = "${pkgs.xorg.lndir}/bin/lndir";
7+ lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir";
88in rec {
99
1010 shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);