nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: hide KF5

Browse Source
This commit is contained in:
K900
2026-04-26 15:49:03 +03:00
parent e12830446f
commit 59ac5638f0
11 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/desktop-managers/plasma6.nix
View File

@@ -191,8 +191,8 @@ in
# Only symlink the KIO plugins, so we don't accidentally pull any services
# like KCMs or kcookiejar
let
kioPluginPath = "${pkgs.plasma5Packages.qtbase.qtPluginPrefix}/kf5/kio";
inherit (pkgs.plasma5Packages) kio;
kioPluginPath = "${pkgs.libsForQt5.qtbase.qtPluginPrefix}/kf5/kio";
inherit (pkgs.libsForQt5.__internalKF5) kio;
in
pkgs.runCommand "kio5-plugins-only" { } ''
mkdir -p $out/${kioPluginPath}

2
pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
View File

@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
mkcal
]
++ (with libsForQt5; [
kcalendarcore
__internalKF5.kcalendarcore
qtbase
])
++ (with lomiri; [

2
pkgs/by-name/mk/mkcal/package.nix
View File

@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
]);
buildInputs = with libsForQt5; [
kcalendarcore
kdePackages.extra-cmake-modules
__internalKF5.kcalendarcore
qtbase
qtpim
timed

2
pkgs/by-name/qt/qtorganizer-mkcal/package.nix
View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
mkcal
]
++ (with libsForQt5; [
kcalendarcore
__internalKF5.kcalendarcore
qtbase
qtpim
]);

7
pkgs/kde/misc/kio-extras-kf5/default.nix
View File

@@ -34,8 +34,11 @@ stdenv.mkDerivation rec {
libsForQt5.wrapQtAppsHook
];
buildInputs = with libsForQt5; [
qtbase
buildInputs =
with libsForQt5;
with libsForQt5.__internalKF5;
[
qtbase
kactivities
kactivities-stats

22
pkgs/kde/plasma/breeze/default.nix
View File

@@ -31,17 +31,17 @@ mkKdeDerivation {
"-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras"
"-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml"
"-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration"
"-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2"
"-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
"-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem"
"-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5FrameworkIntegration_DIR=${libsForQt5.__internalKF5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration"
"-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5Kirigami2_DIR=${libsForQt5.__internalKF5.kirigami2.dev}/lib/cmake/KF5Kirigami2"
"-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
"-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem"
];
# Move Qt5 plugin to Qt5 plugin path

4
pkgs/kde/plasma/kwayland-integration/default.nix
View File

@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
libsForQt5.qtbase
libsForQt5.qtwayland
libsForQt5.kwayland
libsForQt5.kwindowsystem
libsForQt5.__internalKF5.kwayland
libsForQt5.__internalKF5.kwindowsystem
plasma-wayland-protocols
wayland

28
pkgs/kde/plasma/oxygen/default.nix
View File

@@ -27,20 +27,20 @@ mkKdeDerivation {
"-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras"
"-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml"
"-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion"
"-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration"
"-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n"
"-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2"
"-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service"
"-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
"-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem"
"-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5Completion_DIR=${libsForQt5.__internalKF5.kcompletion.dev}/lib/cmake/KF5Completion"
"-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5FrameworkIntegration_DIR=${libsForQt5.__internalKF5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration"
"-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5I18n_DIR=${libsForQt5.__internalKF5.ki18n.dev}/lib/cmake/KF5I18n"
"-DKF5Kirigami2_DIR=${libsForQt5.__internalKF5.kirigami2.dev}/lib/cmake/KF5Kirigami2"
"-DKF5Service_DIR=${libsForQt5.__internalKF5.kservice.dev}/lib/cmake/KF5Service"
"-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
"-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem"
];
# Move Qt5 plugin to Qt5 plugin path

40
pkgs/kde/plasma/plasma-integration/default.nix
View File

@@ -39,26 +39,26 @@ mkKdeDerivation {
"-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml"
"-DQtWaylandScanner_EXECUTABLE=${libsForQt5.qtwayland.dev}/bin/qtwaylandscanner"
"-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Bookmarks_DIR=${libsForQt5.kbookmarks.dev}/lib/cmake/KF5Bookmarks"
"-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion"
"-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n"
"-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5ItemViews_DIR=${libsForQt5.kitemviews.dev}/lib/cmake/KF5ItemViews"
"-DKF5JobWidgets_DIR=${libsForQt5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets"
"-DKF5KIO_DIR=${libsForQt5.kio.dev}/lib/cmake/KF5KIO"
"-DKF5Notifications_DIR=${libsForQt5.knotifications.dev}/lib/cmake/KF5Notifications"
"-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service"
"-DKF5Solid_DIR=${libsForQt5.solid.dev}/lib/cmake/KF5Solid"
"-DKF5Wayland_DIR=${libsForQt5.kwayland.dev}/lib/cmake/KF5Wayland"
"-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
"-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem"
"-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui"
"-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Bookmarks_DIR=${libsForQt5.__internalKF5.kbookmarks.dev}/lib/cmake/KF5Bookmarks"
"-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Completion_DIR=${libsForQt5.__internalKF5.kcompletion.dev}/lib/cmake/KF5Completion"
"-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5I18n_DIR=${libsForQt5.__internalKF5.ki18n.dev}/lib/cmake/KF5I18n"
"-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5ItemViews_DIR=${libsForQt5.__internalKF5.kitemviews.dev}/lib/cmake/KF5ItemViews"
"-DKF5JobWidgets_DIR=${libsForQt5.__internalKF5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets"
"-DKF5KIO_DIR=${libsForQt5.__internalKF5.kio.dev}/lib/cmake/KF5KIO"
"-DKF5Notifications_DIR=${libsForQt5.__internalKF5.knotifications.dev}/lib/cmake/KF5Notifications"
"-DKF5Service_DIR=${libsForQt5.__internalKF5.kservice.dev}/lib/cmake/KF5Service"
"-DKF5Solid_DIR=${libsForQt5.__internalKF5.solid.dev}/lib/cmake/KF5Solid"
"-DKF5Wayland_DIR=${libsForQt5.__internalKF5.kwayland.dev}/lib/cmake/KF5Wayland"
"-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
"-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem"
"-DKF5XmlGui_DIR=${libsForQt5.__internalKF5.kxmlgui.dev}/lib/cmake/KF5XmlGui"
];
extraBuildInputs = [

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

@@ -7137,9 +7137,6 @@ with pkgs;
}
);
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
plasma5Packages = libsForQt5;
qtEnv = qt5.env;
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });

6
pkgs/top-level/qt5-packages.nix
View File

@@ -51,15 +51,15 @@ makeScopeWithSplicing' {
in
(noExtraAttrs (
kdeFrameworks
// qt5
qt5
// {
inherit
kdeFrameworks
qt5
;
__internalKF5 = lib.dontRecurseIntoAttrs kdeFrameworks;
### LIBRARIES
accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { };