From 462e4255fa3238f8766f5a11b461d2c78bbbf3ff Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 23 Jul 2013 19:04:40 +0200 Subject: [PATCH] x11 session: Don't start pulseaudio if it already is running system-wide --- modules/services/x11/display-managers/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix index b49507b73ffa..451355d4980d 100644 --- a/modules/services/x11/display-managers/default.nix +++ b/modules/services/x11/display-managers/default.nix @@ -75,8 +75,10 @@ let if test "''${1:0:1}" = /; then eval exec "$1"; fi # Start PulseAudio if enabled. - ${optionalString config.hardware.pulseaudio.enable '' - ${pkgs.pulseaudio}/bin/pulseaudio --start + ${optionalString (config.hardware.pulseaudio.enable) '' + ${optionalString (!config.hardware.pulseaudio.systemWide) + "${pkgs.pulseaudio}/bin/pulseaudio --start" + } # Publish access credentials in the root window. ${pkgs.pulseaudio}/bin/pactl load-module module-x11-publish "display=$DISPLAY"