From 15f795e391c77d21ee2bef5ec5840bd7bf3775a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Mar 2024 14:40:14 +0100 Subject: [PATCH] nixos/plasma6: don't add kio's KCMs to systemsettings which fail to load anyway --- nixos/modules/services/desktop-managers/plasma6.nix | 2 +- .../libraries/kde-frameworks/kio/default.nix | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index e20b431f0b58..7a4ad6f5ba4f 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -170,7 +170,7 @@ in { breeze.qt5 plasma-integration.qt5 pkgs.plasma5Packages.kwayland-integration - pkgs.plasma5Packages.kio + (pkgs.plasma5Packages.kio.override { withKcms = false; }) 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 8815683aef65..871b6a1f11cf 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,11 +1,12 @@ { - stdenv, lib, mkDerivation, fetchpatch, + stdenv, lib, mkDerivation, extra-cmake-modules, kdoctools, qttools, acl, attr, libkrb5, util-linux, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, - qtbase, qtscript, qtx11extras, solid, kcrash, kded + qtbase, qtscript, qtx11extras, solid, kcrash, kded, + withKcms ? true }: mkDerivation { @@ -29,7 +30,11 @@ mkDerivation { separateDebugInfo = true; 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/"; };