diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-03 17:00:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 17:00:14 +0200 |
| commit | fcb425427688c4849e8cbb32582d124b79b9bb44 (patch) | |
| tree | 32e3367f692a951cc4eacca7fdb1f52cf1a20a3a /nixos/modules | |
| parent | 8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f (diff) | |
| parent | b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36 (diff) | |
| download | nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.tar nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.tar.gz nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.tar.bz2 nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.tar.lz nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.tar.xz nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.tar.zst nixlib-fcb425427688c4849e8cbb32582d124b79b9bb44.zip | |
Merge pull request #43610 from jfrankenau/fix-pulse-module-x11-publish
nixos/display-managers: fix loading of module-x11-publish
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 72a567cc7ca1..78095e7ce0b0 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -61,7 +61,9 @@ let } # Publish access credentials in the root window. - ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then + ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + fi ''} # Tell systemd about our $DISPLAY and $XAUTHORITY. |