diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-28 17:06:09 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-28 17:06:09 +0300 |
commit | c4440c9c744744198f423dfa69cf4d19399ced4c (patch) | |
tree | b603a87605795e4c9af80e6ae193e01752add189 /nixos/modules/config | |
parent | 98a7f819d9ad0f8799b14232c4b979fb604aa53e (diff) | |
download | nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.tar nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.tar.gz nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.tar.bz2 nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.tar.lz nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.tar.xz nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.tar.zst nixlib-c4440c9c744744198f423dfa69cf4d19399ced4c.zip |
Revert "pulseaudio: select correct outputs"
This reverts commit 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.
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 a964e04531c1..f2db428a4441 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; - defaultText = "pkgs.pulseaudioLight"; - example = literalExample "pkgs.pulseaudioFull"; + default = pulseaudioLight.out; + defaultText = "pkgs.pulseaudioLight.out"; + example = literalExample "pkgs.pulseaudioFull.out"; 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 "${getBin cfg.package}/etc/pulse/default.pa"; + hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa"; } (mkIf cfg.enable { @@ -158,7 +158,7 @@ in { wantedBy = [ "default.target" ]; serviceConfig = { Type = "notify"; - ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no"; + ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no"; Restart = "on-failure"; }; }; @@ -195,7 +195,7 @@ in { environment.PULSE_RUNTIME_PATH = stateDir; serviceConfig = { 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"; }; }; |