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); 'range'>range
path: root/gnu/packages/bdw-gc.scm
AgeCommit message (Expand)Author
2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès
2021-07-14utils: Define 'target-hurd?' predicate....It behaves similarily to the other target-...? procedures. The usage of hurd-triplet? / target-hurd? in libgc appears incorrect to me, as (%current-system) is normally never false. * gnu/packages/hurd.scm (hurd-triplet?): Move to ... * guix/util.scm (target-hurd?): ... here, let its argument default to (%current-target-system) or (%current-system), and write a docstring. * gnu/packages/hurd.scm (hurd-target?, hurd-system?): Use target-hurd? instead of hurd-triplet?. * gnu/packages/bdw-gc.scm (libgc): Likewise. * gnu/packages/cross-base.scm (cross-libc)[arguments]<#:configure-flags>: Likewise. (cross-libc)[arguments]<#:phases>: Likewise. (cross-libc)[arguments]<#:native-inputs>: Likewise. * gnu/packages/make-boostrap.scm (%glibc-stripped)[inputs]: Likewise. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Maxime Devos
2021-05-16gnu: libgc: Remove 'libgc/disable-munmap'....This variant is already the default on this branch. * gnu/packages/bdw-gc.scm (libgc/disable-munmap): Remove. Ludovic Courtès
2021-05-15Merge branch 'master' into core-updatesLudovic Courtès
2021-05-13gnu: libgc: Add variant with '--disable-munmap'....* gnu/packages/bdw-gc.scm (libgc/disable-munmap): New variable. Ludovic Courtès
2021-05-08gnu: libgc@8: Build with '--disable-munmap'....Partially fixes <https://bugs.gnu.org/40525>. * gnu/packages/bdw-gc.scm (libgc)[arguments]: Configure with '--disable-munmap'. * gnu/packages/guile.scm (guile-3.0/libgc-7): Remove. * gnu/packages/ci.scm (cuirass)[inputs]: Refer to GUILE-3.0-LATEST instead of GUILE-3.0/LIBGC-7. * guix/self.scm (specification->package): Likewise. Ludovic Courtès