diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks/kio')
3 files changed, 55 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix new file mode 100644 index 000000000000..434496c7b9a9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -0,0 +1,28 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, qttools, + karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, + kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, + kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, + qtbase, qtscript, qtx11extras, solid, kcrash +}: + +mkDerivation { + name = "kio"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications + ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras + kcrash + ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice + kxmlgui qtbase qttools solid + ]; + outputs = [ "out" "dev" ]; + patches = [ + ./samba-search-path.patch + ./kio-debug-module-loader.patch + ]; +} diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch new file mode 100644 index 000000000000..d26af49e5eb2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch @@ -0,0 +1,13 @@ +Index: kio-5.33.0/src/kiod/kiod_main.cpp +=================================================================== +--- kio-5.33.0.orig/src/kiod/kiod_main.cpp ++++ kio-5.33.0/src/kiod/kiod_main.cpp +@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam + module = factory->create<KDEDModule>(); + } + if (!module) { +- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString(); ++ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString(); + return; + } + module->setModuleName(name); // makes it register to DBus diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch new file mode 100644 index 000000000000..d39ffbfde644 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch @@ -0,0 +1,14 @@ +diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp +index 1895783..9fe7286 100644 +--- a/src/core/ksambashare.cpp ++++ b/src/core/ksambashare.cpp +@@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate() + bool KSambaSharePrivate::isSambaInstalled() + { + const bool daemonExists = +- !QStandardPaths::findExecutable(QStringLiteral("smbd"), +- {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); ++ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); + if (!daemonExists) { + qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; + } |