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); tion value='committer'>committer
path: root/gnu/packages/kde-frameworks.scm
AgeCommit message (Expand)Author
2022-05-11gnu: extra-cmake-modules: Update to 5.91.0....* gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.91.0. Fix the indentation. [native-inputs]: Use label-less input style. [arguments]: Use G-expresssions. <phases>: In phase 'fix-lib-path', use QT_MAJOR_VERSION to determine the installation path, Fix the compatibility with different Qt version. Add phase 'fix-test' to workaround with the broken KDEFetchTranslations test. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Zhu Zihao
2022-03-29gnu: pulseaudio-qt: Use mirror URI....* gnu/packages/kde-frameworks.scm (pulseaudio-qt)[source]: Use kde mirror URI. Efraim Flashner
2022-03-11gnu: extra-cmake-modules: Don't run tests when cross-compiling....* gnu/packages/kde-frameworks.scm (extra-cmake-modules)[arguments]<#:tests?>: Set to #false when cross-compiling. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Maxime Devos