diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-07 17:03:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 17:03:52 -0500 |
| commit | 03f8acabc8efd69f62fb37cb89dd275055717699 (patch) | |
| tree | 36ac7fd1bd0c284230ea9126e8b708a87b596911 /nixos/modules | |
| parent | f1af1cb8529c8e0fb471f3b0a508e14afcb5c9de (diff) | |
| parent | 1390ed10e7ba0b62f1fc7a263b054abc780614d3 (diff) | |
| download | nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.tar nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.tar.gz nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.tar.bz2 nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.tar.lz nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.tar.xz nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.tar.zst nixlib-03f8acabc8efd69f62fb37cb89dd275055717699.zip | |
Merge pull request #71408 from f--t/fix/x11-services
Fix nixos x11 service logging for ssdm and xmonad
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/window-managers/xmonad.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 8847acb0c604..899dd8665a25 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -14,7 +14,7 @@ let xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${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" '' diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 0e1314122767..30c59b88f82f 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -86,7 +86,7 @@ in ${xmonadBin} waitPID=$! '' else '' - ${xmonad}/bin/xmonad & + systemd-cat -t xmonad ${xmonad}/bin/xmonad & waitPID=$! ''; }]; |