ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108128 from ttuegel/plasma-sync-qt-version

Browse Source 
nixos/plasma5: synchronize Qt version with all-packages.nix
This commit is contained in:
Thomas Tuegel 2021-01-02 05:47:02 -06:00 committed by GitHub
commit f69c648da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
inherit (pkgs) kdeApplications kdeFrameworks plasma5;
libsForQt5 = pkgs.libsForQt514;
qt5 = pkgs.qt514;
inherit (pkgs) qt5 libsForQt5;
inherit (pkgs) writeText;
pulseaudio = config.hardware.pulseaudio;

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

@ -26705,6 +26705,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;