diff options
| author | aszlig <aszlig@nix.build> | 2020-09-15 01:08:00 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2020-09-15 01:19:15 +0200 |
| commit | 7447bdc5232e86dda606cf17de4f2477eebe514e (patch) | |
| tree | 2afd4f4f80899afd39d7b6ca74b79a2e3fad89ae /nixos | |
| parent | 8cdf9c95c453e15d761378c104b25578f51749d5 (diff) | |
| download | nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.tar nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.tar.gz nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.tar.bz2 nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.tar.lz nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.tar.xz nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.tar.zst nixpkgs-7447bdc5232e86dda606cf17de4f2477eebe514e.zip | |
nixos/plasma5: Fix eval of colord-kde/wacomtablet
Regression introduced by 053b05d14d2fa31750d0aafb8fa92cff512750e8.
The commit in question essentially removed the "with pkgs;" from the
scope around the various packages added to environment.systemPackages.
Since services.colord.enable and services.xserver.wacom.enable are false
by default, the change above didn't directly result in an evaluation
error.
Tested evaluation before and after this change via:
for cfg in hardware.bluetooth.enable \
networking.networkmanager.enable \
hardware.pulseaudio.enable \
powerManagement.enable \
services.colord.enable \
services.samba.enable \
services.xserver.wacom.enable; do
nix-instantiate --eval nixos --arg configuration '{
services.xserver.desktopManager.plasma5.enable = true;
'"$cfg"' = true;
}' -A config.environment.systemPackages > /dev/null
done
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 205410852f6..149f6cbb762 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -309,9 +309,9 @@ in ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil - ++ lib.optional config.services.colord.enable colord-kde + ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] - ++ lib.optional config.services.xserver.wacom.enable wacomtablet; + ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this |