|
|
|
@ -26,7 +26,7 @@ let |
|
|
|
|
# are built with PulseAudio support (like KDE). |
|
|
|
|
clientConf = writeText "client.conf" '' |
|
|
|
|
autospawn=${if nonSystemWide then "yes" else "no"} |
|
|
|
|
${optionalString nonSystemWide "daemon-binary=${cfg.package}/bin/pulseaudio"} |
|
|
|
|
${optionalString nonSystemWide "daemon-binary=${cfg.package.out}/bin/pulseaudio"} |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
# Write an /etc/asound.conf that causes all ALSA applications to |
|
|
|
@ -129,11 +129,11 @@ in { |
|
|
|
|
source = clientConf; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa"; |
|
|
|
|
hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
(mkIf cfg.enable { |
|
|
|
|
environment.systemPackages = [ cfg.package ]; |
|
|
|
|
environment.systemPackages = [ cfg.package.out ]; |
|
|
|
|
|
|
|
|
|
environment.etc = singleton { |
|
|
|
|
target = "asound.conf"; |
|
|
|
@ -170,7 +170,7 @@ in { |
|
|
|
|
before = [ "sound.target" ]; |
|
|
|
|
environment.PULSE_RUNTIME_PATH = stateDir; |
|
|
|
|
serviceConfig = { |
|
|
|
|
ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}"; |
|
|
|
|
ExecStart = "${cfg.package.out}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}"; |
|
|
|
|
PIDFile = "${stateDir}/pid"; |
|
|
|
|
}; |
|
|
|
|
}; |
|
|
|
|