diff options
| author | K900 <me@0upti.me> | 2024-04-09 08:42:50 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-04-09 19:10:10 +0300 |
| commit | f18f62d23af7f1c9f742033617d115e01fe8c807 (patch) | |
| tree | 9b517d3e3bc02b26979bbffe602ff1d2b20a1a30 | |
| parent | 52edad5c8ae24fd6abadcb172e6a74aea42a8ff0 (diff) | |
nixos/plasma6: better way to install kio5 plugins
This should _for sure_ avoid pulling in unnecessary bits.
| -rw-r--r-- | nixos/modules/services/desktop-managers/plasma6.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kio/default.nix | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 796870aab125..923dc2f1d173 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -170,7 +170,17 @@ in { breeze.qt5 plasma-integration.qt5 pkgs.plasma5Packages.kwayland-integration - (pkgs.plasma5Packages.kio.override { withKcms = false; }) + ( + # 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; + in pkgs.runCommand "kio5-plugins-only" {} '' + mkdir -p $out/${kioPluginPath} + ln -s ${kio}/${kioPluginPath}/* $out/${kioPluginPath} + '' + ) kio-extras-kf5 ] # Optional hardware support features diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 871b6a1f11cf..522c27bf56eb 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -6,7 +6,6 @@ kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, qtbase, qtscript, qtx11extras, solid, kcrash, kded, - withKcms ? true }: mkDerivation { @@ -31,10 +30,6 @@ mkDerivation { patches = [ ./0001-Remove-impure-smbd-search-path.patch ]; - postPatch = lib.optionalString (!withKcms) '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail "add_subdirectory(kcms)" "" - ''; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; }; |