Search the "extra libs" in GUIX_KF5INIT_LIB_PATH (which basically is a collection of all /lib directories). We can not hard-code the full path to the libsKF5Plasam, since adding palse-workspace Adopted from NixOS pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch =================================================================== --- kinit-5.32.0/src/kdeinit/kinit-5.32.0/src/kdeinit/.orig +++ kinit-5.32.0/src/kdeinit/kinit.cpp @@ -96,9 +96,9 @@ "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else - "libKF5KIOCore.so.5", - "libKF5Parts.so.5", - "libKF5Plasma.so.5" + "GUIX_PKGS_KF5_KIO/lib/libKF5KIOCore.so.5", + "GUIX_PKGS_KF5_PARTS/lib/libKF5Parts.so.5", + "GUIX_PKGS_KF5_PLASMA/lib/libKF5Plasma.so.5" #endif }; #endif @@ -1533,20 +1531,6 @@ static int initXconnection() } #endif -#ifndef Q_OS_OSX -// Find a shared lib in the lib dir, e.g. libkio.so. -// Completely unrelated to plugins. -static QString findSharedLib(const QString &lib) -{ - QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; - if (QFile::exists(path)) { - return path; - } - // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? - return QString(); -} -#endif - extern "C" { static void secondary_child_handler(int) @@ -1673,7 +1673,7 @@ #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { for (const char *extra_lib : extra_libs) { - const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); + const QString extra = QString::fromLatin1(extra_lib); if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); nput class='txt' type='search' size='10' name='q' value=''/>
path: root/tests/packages.scm
AgeCommit message (Expand)Author
2023-09-15tests: Fix "package-transitive-supported-systems, implicit inputs"....Janneke Nieuwenhuizen
2023-08-18tests: packages: Set system for expected result of package->bag....Josselin Poiret
2023-06-14packages: 'package-transitive-supported-systems' detects cycles....Ludovic Courtès
2023-04-19tests: Re-add debug output to a package tests....Maxim Cournoyer
2023-03-13packages: 'package-input-rewriting/spec' ignores hidden packages....Ludovic Courtès
2023-03-13packages: Consider 'patches' by 'package-direct-sources'....Simon Tournier
2022-12-13packages: Add 'package-upstream-name*'....Lars-Dominik Braun
2022-11-11grafts: Run with a UTF-8 locale....Ludovic Courtès
2022-10-22Remove now unnecessary uses of (guix grafts)....Ludovic Courtès
2022-10-10packages: Raise an exception for invalid 'license' values....Ludovic Courtès