mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-26 08:48:38 +03:00
Merge pull request #300241 from SuperSandro2000/plasma6-kio-no-kcms
nixos/plasma6: don't add kio's KCMs to systemsettings
This commit is contained in:
commit
0473abba29
@ -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
|
||||
|
@ -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/";
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user