Merge pull request #302758 from K900/kio-shenanigans

nixos/plasma6: better way to install kio5 plugins
NixOS · Apr 9, 2024 · 97d675f · 97d675f
2 parents 74d0371 + f18f62d
commit 97d675f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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/";
   };