From cb29abf3a99fa13cae065ba79e1562fc7ee18264 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 23 Oct 2020 09:16:25 +0300 Subject: [PATCH] all-packages.nix: Inherit kdesu in a different scope Part of #101369: In order to avoid packages using the default `kdesu` always built with qt515, we put it in scope only for packages defined with a `libsForQt5`, to avoid incompatible qt versions used together in inputs of a package. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0d1072477e6..ae65a3e235eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15196,7 +15196,7 @@ in kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose - kcontacts kquickcharts kdoctools kapidox; + kcontacts kquickcharts kdoctools kapidox kdesu; ### KDE PLASMA 5 @@ -21735,8 +21735,6 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {