about summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/default.nix
diff options
context:
space:
mode:
authorKirill Elagin <kirelagin@gmail.com>2014-10-27 15:43:19 +0300
committerKirill Elagin <kirelagin@gmail.com>2014-10-27 15:43:19 +0300
commit0c6d49da7deb27243420db89109fdba6e6458ce5 (patch)
treefd837dbc61977ab567cf1162a08ef7d0f7f67e59 /nixos/modules/services/x11/display-managers/default.nix
parente2ada42623f26d51cf7d1253ac0700297e1a9b83 (diff)
downloadnixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.tar
nixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.tar.gz
nixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.tar.bz2
nixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.tar.lz
nixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.tar.xz
nixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.tar.zst
nixlib-0c6d49da7deb27243420db89109fdba6e6458ce5.zip
xsession: Start the right pulseaudio binary
Fixes #4663.
Diffstat (limited to 'nixos/modules/services/x11/display-managers/default.nix')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 004ea6ef49ac..899c5a91fb33 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -68,14 +68,14 @@ let
       # Start PulseAudio if enabled.
       ${optionalString (config.hardware.pulseaudio.enable) ''
         ${optionalString (!config.hardware.pulseaudio.systemWide)
-          "${pkgs.pulseaudio}/bin/pulseaudio --start"
+          "${config.hardware.pulseaudio.package}/bin/pulseaudio --start"
         }
 
         # Publish access credentials in the root window.
-        ${pkgs.pulseaudio}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
+        ${config.hardware.pulseaudio.package}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
 
         # Keep track of devices.  Mostly useful for Phonon/KDE.
-        ${pkgs.pulseaudio}/bin/pactl load-module module-device-manager "do_routing=1"
+        ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
       # Load X defaults.