summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2018-08-12 22:23:45 +0200
committerGitHub <noreply@github.com>2018-08-12 22:23:45 +0200
commitb4d15afe0225c26c0cdeb4a6d9c662de827f6ae3 (patch)
treed7f35639b9672fbc873da46c86b93713d70918a1 /nixos
parenta05e006675bc818336b8df4f68d3b5ab7be628fa (diff)
parentced374cf98935f6410ed124a9bed114731c23b9e (diff)
downloadnixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.tar
nixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.tar.gz
nixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.tar.bz2
nixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.tar.lz
nixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.tar.xz
nixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.tar.zst
nixlib-b4d15afe0225c26c0cdeb4a6d9c662de827f6ae3.zip
Merge pull request #44876 from eadwu/display-managers/pulseaudio-rely-on-socket
nixos/display-managers: rely on socket to activate pulseaudio
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 78095e7ce0b0..66886f23737d 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -56,10 +56,6 @@ let
 
       # Start PulseAudio if enabled.
       ${optionalString (config.hardware.pulseaudio.enable) ''
-        ${optionalString (!config.hardware.pulseaudio.systemWide)
-          "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start"
-        }
-
         # Publish access credentials in the root window.
         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"