git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/plasma5: synchronize Qt version with all-packages.nix
commite65962eafd99dfb1d2aadc52e7b78b91810e8b87 authorThomas Tuegel <ttuegel@mailbox.org> dateFri 1 Jan 2021, 08:25 (6 years ago) parent5bcc263
2 files changed+3−2
nixos/modules/services/x11/desktop-managers/plasma5.nix+1−2 pkgs/top-level/all-packages.nix+2
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
@@ -26689,6 +26689,8 @@ in
2668926689 let
2669026690 mkPlasma5 = import ../desktops/plasma-5;
2669126691 attrs = {
26692+ # ATTN: The Qt version used in the NixOS Plasma module must be updated
26693+ # whenever this changes!
2669226694 inherit libsForQt5;
2669326695 inherit lib fetchurl;
2669426696 gconf = gnome2.GConf;