commit dfad31d753eccdd592850adf2599d132236b63cf · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #142273 from ju1m/display-managers

authored by Artturi and committed by GitHub 4 years ago dfad31d7 8b5982c9

+3 -3

2 changed files

expand all

unified split

nixos

modules

services

x11

display-managers

default.nix

system

boot

systemd-lib.nix

+2 -2

nixos/modules/services/x11/display-managers/default.nix

··· 122 done 123 124 if test -d ${pkg}/share/xsessions; then 125 - ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions 126 fi 127 if test -d ${pkg}/share/wayland-sessions; then 128 - ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions 129 fi 130 '') cfg.displayManager.sessionPackages} 131 '';

··· 122 done 123 124 if test -d ${pkg}/share/xsessions; then 125 + ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions 126 fi 127 if test -d ${pkg}/share/wayland-sessions; then 128 + ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions 129 fi 130 '') cfg.displayManager.sessionPackages} 131 '';

+1 -1

nixos/modules/system/boot/systemd-lib.nix

··· 4 5 let 6 cfg = config.systemd; 7 - lndir = "${pkgs.xorg.lndir}/bin/lndir"; 8 in rec { 9 10 shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);

··· 4 5 let 6 cfg = config.systemd; 7 + lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir"; 8 in rec { 9 10 shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);