public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71408 from f--t/fix/x11-services

Browse Source 
Fix nixos x11 service logging for ssdm and xmonad
This commit is contained in:
Matthew Bauer 2019-11-07 17:03:52 -05:00 committed by GitHub
commit 03f8acabc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -14,7 +14,7 @@ let
xserverWrapper = pkgs.writeScript "xserver-wrapper" '' xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh #!/bin/sh
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
exec systemd-cat ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@" exec systemd-cat -t xserver-wrapper ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@"
''; '';
Xsetup = pkgs.writeScript "Xsetup" '' Xsetup = pkgs.writeScript "Xsetup" ''

2
nixos/modules/services/x11/window-managers/xmonad.nix
View File

@ -86,7 +86,7 @@ in
${xmonadBin} ${xmonadBin}
waitPID=$! waitPID=$!
'' else '' '' else ''
${xmonad}/bin/xmonad & systemd-cat -t xmonad ${xmonad}/bin/xmonad &
waitPID=$! waitPID=$!
''; '';
}]; }];