summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/kinit-kdeinit-extra_libs.patch
blob: 1271f3df7deee87c9dbd8b8440a0946c23e25178 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
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);