alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/plasma5: synchronize Qt version with all-packages.nix

Browse source
This commit is contained in:
Thomas Tuegel 2021-01-01 08:25:44 -06:00
parent 5bcc26338d
commit e65962eafd
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -8,8 +8,7 @@ let
cfg = xcfg.desktopManager.plasma5; cfg = xcfg.desktopManager.plasma5;
inherit (pkgs) kdeApplications kdeFrameworks plasma5; inherit (pkgs) kdeApplications kdeFrameworks plasma5;
libsForQt5 = pkgs.libsForQt514; inherit (pkgs) qt5 libsForQt5;
qt5 = pkgs.qt514;
inherit (pkgs) writeText; inherit (pkgs) writeText;
pulseaudio = config.hardware.pulseaudio; pulseaudio = config.hardware.pulseaudio;

2
pkgs/top-level/all-packages.nix
View file

@ -26689,6 +26689,8 @@ in
let let
mkPlasma5 = import ../desktops/plasma-5; mkPlasma5 = import ../desktops/plasma-5;
attrs = { attrs = {
# ATTN: The Qt version used in the NixOS Plasma module must be updated
# whenever this changes!
inherit libsForQt5; inherit libsForQt5;
inherit lib fetchurl; inherit lib fetchurl;
gconf = gnome2.GConf; gconf = gnome2.GConf;