diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-28 16:42:16 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-28 16:45:42 +0300 |
commit | 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38 (patch) | |
tree | 11d5943c2d3137ce9aef97419084cc3e46e71e07 /nixos/modules/config | |
parent | dcde0265a8c369361ff7be9a28f158b2d4bdadb8 (diff) | |
download | nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.tar nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.tar.gz nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.tar.bz2 nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.tar.lz nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.tar.xz nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.tar.zst nixlib-5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.zip |
pulseaudio: select correct outputs
Original fixes by ttuegel and peterhoeg.
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/pulseaudio.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index f2db428a4441..a964e04531c1 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -98,9 +98,9 @@ in { package = mkOption { type = types.package; - default = pulseaudioLight.out; - defaultText = "pkgs.pulseaudioLight.out"; - example = literalExample "pkgs.pulseaudioFull.out"; + default = pulseaudioLight; + defaultText = "pkgs.pulseaudioLight"; + example = literalExample "pkgs.pulseaudioFull"; description = '' The PulseAudio derivation to use. This can be used to enable features (such as JACK support, Bluetooth) via the @@ -130,7 +130,7 @@ in { source = clientConf; }; - hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa"; + hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa"; } (mkIf cfg.enable { @@ -158,7 +158,7 @@ in { wantedBy = [ "default.target" ]; serviceConfig = { Type = "notify"; - ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no"; + ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no"; Restart = "on-failure"; }; }; @@ -195,7 +195,7 @@ in { environment.PULSE_RUNTIME_PATH = stateDir; serviceConfig = { Type = "notify"; - ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; + ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; Restart = "on-failure"; }; }; |