diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-08 09:03:50 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-08 09:03:50 -0600 |
| commit | ba443da270a8f7eb6174134c54c2d56a184a9561 (patch) | |
| tree | 5f940048630e55db4aa5aeefd1a250453a83a25b | |
| parent | 53588bac9655ec66b67a4bbba959f6029abc260c (diff) | |
| download | nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.tar nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.tar.gz nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.tar.bz2 nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.tar.lz nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.tar.xz nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.tar.zst nixlib-ba443da270a8f7eb6174134c54c2d56a184a9561.zip | |
kde5.kio: fix Samba detection
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.17/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.17/kio.nix) | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch | 28 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.17/kio/series | 1 |
4 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix index 828faaa631f6..f41aebcb59d3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/default.nix @@ -74,7 +74,7 @@ let kidletime = callPackage ./kidletime.nix {}; kimageformats = callPackage ./kimageformats.nix {}; kinit = callPackage ./kinit {}; - kio = callPackage ./kio.nix {}; + kio = callPackage ./kio {}; kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kjobwidgets = callPackage ./kjobwidgets.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix index 199565e24185..a2131ff33850 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix @@ -1,4 +1,5 @@ -{ kdeFramework, lib, extra-cmake-modules, acl, karchive +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, acl, karchive , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet @@ -8,6 +9,7 @@ kdeFramework { name = "kio"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch new file mode 100644 index 000000000000..c9ad46b41bb7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch @@ -0,0 +1,28 @@ +Index: kio-5.17.0/src/core/ksambashare.cpp +=================================================================== +--- kio-5.17.0.orig/src/core/ksambashare.cpp ++++ kio-5.17.0/src/core/ksambashare.cpp +@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( + + bool KSambaSharePrivate::isSambaInstalled() + { +- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { +- return true; ++ const QByteArray pathEnv = qgetenv("PATH"); ++ if (!pathEnv.isEmpty()) { ++ QLatin1Char pathSep(':'); ++ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/smbd"); ++ if (QFile::exists(*it)) { ++ return true; ++ } ++ } + } + +- //qDebug() << "Samba is not installed!"; +- + return false; + } + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/series b/pkgs/development/libraries/kde-frameworks-5.17/kio/series new file mode 100644 index 000000000000..77ca15450047 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/series @@ -0,0 +1 @@ +samba-search-path.patch |