Adopted from NixOS pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch =================================================================== --- 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(QStringLiteral("/smbd")); + if (QFile::exists(*it)) { + return true; + } + } } - //qDebug() << "Samba is not installed!"; - return false; } /'>aboutsummaryrefslogtreecommitdiff
path: root/tests/cpan.scm
AgeCommit message (Expand)Author
2020-01-15import: cpan: Rewrite tests to use an HTTP server instead of mocking....* guix/import/cpan.scm (%metacpan-base-url): New variable. (module->dist-name, cpan-fetch): Refer to it instead of the hard-coded URL. * tests/cpan.scm ("cpan->guix-package"): Use 'with-http-server' instead of 'mock'. Ludovic Courtès
2020-01-15import: cpan: Rewrite to use 'define-json-mapping'....* guix/import/cpan.scm (<cpan-dependency>, <cpan-release>): New JSON-mapped record types. (metacpan-url->mirror-url): New procedure. (cpan-source-url): Rewrite in terms of it. (cpan-version): Remove. (cpan-module->sexp): Rewrite to take a <cpan-release> instead of an alist, and rename 'meta' to 'release'. [convert-inputs]: Rewrite to use 'cpan-release-dependencies'. Update calls to 'convert-inputs' to pass a list of symbols. Replace 'assoc-ref' calls with the appropriate field accessors. (cpan->guix-package): Rename 'module-meta' to 'release'. (latest-release): Likewise, and use the appropriate accessors. * tests/cpan.scm (test-json): Remove "prereqs" record; add "dependency" list. ("source-url-http", "source-url-https"): Remove. ("metacpan-url->mirror-url, http") ("metacpan-url->mirror-url, https"): New tests. Ludovic Courtès