diff options
| author | Artturi <Artturin@artturin.com> | 2021-10-23 03:58:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 03:58:21 +0300 |
| commit | dfad31d753eccdd592850adf2599d132236b63cf (patch) | |
| tree | 4eeeb1c5d23f53ebfda190c177c22c73253e7e48 | |
| parent | 8b5982c9a7dc2f2d7bde247e205ce913d0129731 (diff) | |
| parent | 2ef7fec214d715f1d33331151f142467239a0ec3 (diff) | |
Merge pull request #142273 from ju1m/display-managers
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd-lib.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 7fc8db95a485c..d910ac566d87b 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -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} ''; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 2dbf15031a088..6c4d27018eed8 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -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); |