alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Move PulseAudio initialisation below the re-exec to prevent it from

Browse source 
being started twice.

svn path=/nixos/trunk/; revision=27968
This commit is contained in:
Eelco Dolstra 2011-07-26 18:34:10 +00:00
parent 3fdc209978
commit 3b374ea326
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/services/x11/display-managers/default.nix
View file

@ -57,6 +57,9 @@ let
exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType" exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi fi
# Handle being called by kdm.
if test "''${1:0:1}" = /; then eval exec "$1"; fi
# Start PulseAudio if enabled. # Start PulseAudio if enabled.
${optionalString config.hardware.pulseaudio.enable '' ${optionalString config.hardware.pulseaudio.enable ''
${pkgs.pulseaudio}/bin/pulseaudio --start ${pkgs.pulseaudio}/bin/pulseaudio --start
@ -68,9 +71,6 @@ let
${pkgs.pulseaudio}/bin/pactl load-module module-device-manager "do_routing=1" ${pkgs.pulseaudio}/bin/pactl load-module module-device-manager "do_routing=1"
''} ''}
# Handle being called by kdm.
if test "''${1:0:1}" = /; then eval exec "$1"; fi
# Load X defaults. # Load X defaults.
if test -e ~/.Xdefaults; then if test -e ~/.Xdefaults; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults