Merge pull request #108128 from ttuegel/plasma-sync-qt-version
nixos/plasma5: synchronize Qt version with all-packages.nix
commitf69c648da4a980d87c4f7d3b4935a85238edbb39
authorThomas Tuegel <ttuegel@mailbox.org>
dateSat 2 Jan 2021, 05:47 (6 years ago)
parentff47554e65962e
nixos/modules/services/x11/desktop-managers/plasma5.nix+1−2
@@ -8,8 +8,7 @@ let
88 cfg = xcfg.desktopManager.plasma5;
99
1010 inherit (pkgs) kdeApplications kdeFrameworks plasma5;
11− libsForQt5 = pkgs.libsForQt514;
12− qt5 = pkgs.qt514;
11+ inherit (pkgs) qt5 libsForQt5;
1312 inherit (pkgs) writeText;
1413
1514 pulseaudio = config.hardware.pulseaudio;
pkgs/top-level/all-packages.nix+2
@@ -26705,6 +26705,8 @@ in
2670526705 let
2670626706 mkPlasma5 = import ../desktops/plasma-5;
2670726707 attrs = {
26708+ # ATTN: The Qt version used in the NixOS Plasma module must be updated
26709+ # whenever this changes!
2670826710 inherit libsForQt5;
2670926711 inherit lib fetchurl;
2671026712 gconf = gnome2.GConf;