From e65962eafd99dfb1d2aadc52e7b78b91810e8b87 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 1 Jan 2021 08:25:44 -0600 Subject: [PATCH] nixos/plasma5: synchronize Qt version with all-packages.nix --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index a9b0b8dc23fb..5f1c099c283d 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -8,8 +8,7 @@ let cfg = xcfg.desktopManager.plasma5; inherit (pkgs) kdeApplications kdeFrameworks plasma5; - libsForQt5 = pkgs.libsForQt514; - qt5 = pkgs.qt514; + inherit (pkgs) qt5 libsForQt5; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0aa4b5656d3d..129deab3df40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26689,6 +26689,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { + # ATTN: The Qt version used in the NixOS Plasma module must be updated + # whenever this changes! inherit libsForQt5; inherit lib fetchurl; gconf = gnome2.GConf;