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: 98036b1a1891
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98754abe7822
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 11, 2020

  1. Copy the full SHA
    21b2900 View commit details
  2. Merge pull request #97735 from orivej/plasma5-bluetooth

    nixos/plasma5: fix build with hardware.bluetooth.enable after #97456
    ttuegel authored Sep 11, 2020
    Copy the full SHA
    98754ab View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/x11/desktop-managers/plasma5.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
@@ -305,7 +305,7 @@ in
++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc

# Optional hardware support features
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ]
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ]
++ lib.optional config.networking.networkmanager.enable plasma-nm
++ lib.optional config.hardware.pulseaudio.enable plasma-pa
++ lib.optional config.powerManagement.enable powerdevil