pulseaudio: select correct outputs

Original fixes by ttuegel and peterhoeg.

+8 -8
+6 -6
nixos/modules/config/pulseaudio.nix
··· 98 98 99 99 package = mkOption { 100 100 type = types.package; 101 - default = pulseaudioLight.out; 102 - defaultText = "pkgs.pulseaudioLight.out"; 103 - example = literalExample "pkgs.pulseaudioFull.out"; 101 + default = pulseaudioLight; 102 + defaultText = "pkgs.pulseaudioLight"; 103 + example = literalExample "pkgs.pulseaudioFull"; 104 104 description = '' 105 105 The PulseAudio derivation to use. This can be used to enable 106 106 features (such as JACK support, Bluetooth) via the ··· 130 130 source = clientConf; 131 131 }; 132 132 133 - hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa"; 133 + hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa"; 134 134 } 135 135 136 136 (mkIf cfg.enable { ··· 158 158 wantedBy = [ "default.target" ]; 159 159 serviceConfig = { 160 160 Type = "notify"; 161 - ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no"; 161 + ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no"; 162 162 Restart = "on-failure"; 163 163 }; 164 164 }; ··· 195 195 environment.PULSE_RUNTIME_PATH = stateDir; 196 196 serviceConfig = { 197 197 Type = "notify"; 198 - ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; 198 + ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; 199 199 Restart = "on-failure"; 200 200 }; 201 201 };
+1 -1
nixos/modules/services/x11/desktop-managers/kde4.nix
··· 111 111 # Load PulseAudio module for routing support. 112 112 # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ 113 113 ${optionalString config.hardware.pulseaudio.enable '' 114 - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 114 + ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 115 115 ''} 116 116 117 117 # Start KDE.
+1 -1
nixos/modules/services/x11/desktop-managers/kde5.nix
··· 39 39 # Load PulseAudio module for routing support. 40 40 # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ 41 41 ${optionalString config.hardware.pulseaudio.enable '' 42 - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 42 + ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 43 43 ''} 44 44 45 45 exec "${kde5.startkde}"