Author: eelco
Date: Tue Jul 26 18:16:24 2011
New Revision: 27967
URL: https://svn.nixos.org/websvn/nix/?rev=27967&sc=1
Log:
* Start PulseAudio from the X session script.
Modified:
nixos/trunk/modules/services/x11/display-managers/default.nix
Modified: nixos/trunk/modules/services/x11/display-managers/default.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/default.nix Tue Jul
26 17:35:47 2011 (r27966)
+++ nixos/trunk/modules/services/x11/display-managers/default.nix Tue Jul
26 18:16:24 2011 (r27967)
@@ -57,6 +57,17 @@
exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi
+ # Start PulseAudio if enabled.
+ ${optionalString config.hardware.pulseaudio.enable ''
+ ${pkgs.pulseaudio}/bin/pulseaudio --start
+
+ # Publish access credentials in the root window.
+ ${pkgs.pulseaudio}/bin/pactl load-module module-x11-publish
"display=$DISPLAY"
+
+ # Keep track of devices. Mostly useful for Phonon/KDE.
+ ${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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
