summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorJohannes Frankenau <johannes@frankenau.net>2018-06-22 21:23:58 +0200
committerJohannes Frankenau <johannes@frankenau.net>2018-08-03 12:22:28 +0200
commitb7ce7d5b3f3b2b95476afb39739f40d1f38f5e36 (patch)
tree7acce14524cd9d0deb685364123c1c235a93ffd4 /nixos/modules
parent4d40a0a940db151f4010dc81bf486ec68c3f4ae1 (diff)
downloadnixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.tar
nixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.tar.gz
nixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.tar.bz2
nixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.tar.lz
nixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.tar.xz
nixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.tar.zst
nixlib-b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36.zip
nixos/display-managers: fix loading of module-x11-publish
module-x11-publish is only provided by the pulseaudioFull package.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 43ed21c95fee..c934642db5ca 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -90,7 +90,9 @@ let
         }
 
         # Publish access credentials in the root window.
-        ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
+        if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then
+          ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
+        fi
       ''}
 
       # Tell systemd about our $DISPLAY and $XAUTHORITY.