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:42:16 +0300 |
| commit | d619a75da17371e21845fff2a6f9d8b547e46c45 (patch) | |
| tree | a841ed6ef4032f1dfee7602a7096d0d303ef81a6 /nixos/modules | |
| parent | b465dc202f0ba6e5ce465c5dabca2b2a3560cad6 (diff) | |
| download | nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.tar nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.tar.gz nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.tar.bz2 nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.tar.lz nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.tar.xz nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.tar.zst nixlib-d619a75da17371e21845fff2a6f9d8b547e46c45.zip | |
pulseaudio: select correct outputs
Original fixes by ttuegel and peterhoeg.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 12 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde4.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 2 |
3 files changed, 8 insertions, 8 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"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 3b639f672170..1927341e45d4 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -111,7 +111,7 @@ in # Load PulseAudio module for routing support. # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ ${optionalString config.hardware.pulseaudio.enable '' - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" + ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} # Start KDE. diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index f90f4dc856de..56b45609a2cd 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -39,7 +39,7 @@ in # Load PulseAudio module for routing support. # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ ${optionalString config.hardware.pulseaudio.enable '' - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" + ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} exec "${kde5.startkde}" |