From 4fd58aa4e18c06ead397ad45d68b76d0930c6cbb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:23:24 -0500 Subject: [PATCH] lxqt: pin to Qt 5.14 --- pkgs/desktops/lxqt/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 45714260381b46..9105cb0c9c37b0 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -53,14 +53,14 @@ let preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT - pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel - pkgs.libsForQt5.libkscreen # provides plugins for screen management software + libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + libsForQt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc6ec4d348a1f6..ca4c69c80961e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25440,7 +25440,8 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5; + libsForQt5 = libsForQt514; + inherit pkgs; inherit (lib) makeScope; });