Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8d708d28a11a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fcb425427688
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 3, 2018

  1. nixos/display-managers: fix loading of module-x11-publish 

    module-x11-publish is only provided by the pulseaudioFull package.
    @jfrankenau
    jfrankenau committed Aug 3, 2018
    Copy the full SHA
    b7ce7d5 View commit details

  2. Merge pull request #43610 from jfrankenau/fix-pulse-module-x11-publish 

    nixos/display-managers: fix loading of module-x11-publish
    @infinisil
    infinisil authored Aug 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fcb4254 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 nixos/modules/services/x11/display-managers/default.nix
4 changes: 3 additions & 1 deletion nixos/modules/services/x11/display-managers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,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.