diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-08 11:51:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:56 +0200 |
| commit | 8db97583ae35fbefbdfced150ea86289b66ffc7b (patch) | |
| tree | 5c428412a128f511de0604372b69c13c0b1e9527 /nixos | |
| parent | e0ed398346bbd84e42931df7fd88a3b2427c0049 (diff) | |
| download | nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.tar nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.tar.gz nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.tar.bz2 nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.tar.lz nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.tar.xz nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.tar.zst nixlib-8db97583ae35fbefbdfced150ea86289b66ffc7b.zip | |
pulseaudio: split the "dev" output
This is meant mainly for the `libpulseaudio` attribute.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 2ebc61260558..2c40895296c6 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -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"; }; }; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index ca0832e5b0c8..997ab030af92 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -85,14 +85,14 @@ let # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' ${optionalString (!config.hardware.pulseaudio.systemWide) - "${config.hardware.pulseaudio.package}/bin/pulseaudio --start" + "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start" } # Publish access credentials in the root window. - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" # Keep track of devices. Mostly useful for Phonon/KDE. - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" + ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-device-manager "do_routing=1" ''} # Tell systemd about our $DISPLAY. This is needed by the |