colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #300241 from SuperSandro2000/plasma6-kio-no-kcms

Browse Source 
nixos/plasma6: don't add kio's KCMs to systemsettings
This commit is contained in:
K900 2024-04-08 10:57:23 +03:00 committed by GitHub
commit 0473abba29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ in {
breeze.qt5 breeze.qt5
plasma-integration.qt5 plasma-integration.qt5
pkgs.plasma5Packages.kwayland-integration pkgs.plasma5Packages.kwayland-integration
pkgs.plasma5Packages.kio (pkgs.plasma5Packages.kio.override { withKcms = false; })
kio-extras-kf5 kio-extras-kf5
] ]
# Optional hardware support features # Optional hardware support features

11
pkgs/development/libraries/kde-frameworks/kio/default.nix
View File

@ -1,11 +1,12 @@
{ {
stdenv, lib, mkDerivation, fetchpatch, stdenv, lib, mkDerivation,
extra-cmake-modules, kdoctools, qttools, extra-cmake-modules, kdoctools, qttools,
acl, attr, libkrb5, util-linux, acl, attr, libkrb5, util-linux,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
qtbase, qtscript, qtx11extras, solid, kcrash, kded qtbase, qtscript, qtx11extras, solid, kcrash, kded,
withKcms ? true
}: }:
mkDerivation { mkDerivation {
@ -29,7 +30,11 @@ mkDerivation {
separateDebugInfo = true; separateDebugInfo = true;
patches = [ patches = [
./0001-Remove-impure-smbd-search-path.patch ./0001-Remove-impure-smbd-search-path.patch
]; ];
postPatch = lib.optionalString (!withKcms) ''
substituteInPlace src/CMakeLists.txt \
--replace-fail "add_subdirectory(kcms)" ""
'';
meta = { meta = {
homepage = "https://api.kde.org/frameworks/kio/html/"; homepage = "https://api.kde.org/frameworks/kio/html/";
}; };