public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pulseaudio: select correct outputs"

Browse Source 
This reverts commit 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.
This commit is contained in:
Nikolay Amiantov 2016-04-28 17:06:09 +03:00
parent 98a7f819d9
commit c4440c9c74
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/config/pulseaudio.nix
View File

@ -98,9 +98,9 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pulseaudioLight; default = pulseaudioLight.out;
defaultText = "pkgs.pulseaudioLight"; defaultText = "pkgs.pulseaudioLight.out";
example = literalExample "pkgs.pulseaudioFull"; example = literalExample "pkgs.pulseaudioFull.out";
description = '' description = ''
The PulseAudio derivation to use. This can be used to enable The PulseAudio derivation to use. This can be used to enable
features (such as JACK support, Bluetooth) via the features (such as JACK support, Bluetooth) via the
@ -130,7 +130,7 @@ in {
source = clientConf; source = clientConf;
}; };
hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa"; hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa";
} }
(mkIf cfg.enable { (mkIf cfg.enable {
@ -158,7 +158,7 @@ in {
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
serviceConfig = { serviceConfig = {
Type = "notify"; Type = "notify";
ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no"; ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no";
Restart = "on-failure"; Restart = "on-failure";
}; };
}; };
@ -195,7 +195,7 @@ in {
environment.PULSE_RUNTIME_PATH = stateDir; environment.PULSE_RUNTIME_PATH = stateDir;
serviceConfig = { serviceConfig = {
Type = "notify"; Type = "notify";
ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
Restart = "on-failure"; Restart = "on-failure";
}; };
}; };

2
nixos/modules/services/x11/desktop-managers/kde4.nix
View File

@ -111,7 +111,7 @@ in
# Load PulseAudio module for routing support. # Load PulseAudio module for routing support.
# See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
${optionalString config.hardware.pulseaudio.enable '' ${optionalString config.hardware.pulseaudio.enable ''
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''} ''}
# Start KDE. # Start KDE.

2
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -59,7 +59,7 @@ in
# Load PulseAudio module for routing support. # Load PulseAudio module for routing support.
# See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
${optionalString config.hardware.pulseaudio.enable '' ${optionalString config.hardware.pulseaudio.enable ''
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''} ''}
exec "${kde5.startkde}" exec "${kde5.startkde}"