diff options
Diffstat (limited to 'pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch')
| -rw-r--r-- | pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch new file mode 100644 index 000000000000..47538fbe4567 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch @@ -0,0 +1,34 @@ +Index: kinit-5.21.0/src/kdeinit/kinit.cpp +=================================================================== +--- kinit-5.21.0.orig/src/kdeinit/kinit.cpp ++++ kinit-5.21.0/src/kdeinit/kinit.cpp +@@ -657,19 +657,16 @@ static pid_t launch(int argc, const char + + if (!libpath.isEmpty()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- QString orig_libpath = libpath; +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); +- if (!l.load()) { +- libpath = orig_libpath; +- l.setFileName(libpath); +- l.load(); ++ // Try to load the library relative to the active profiles. ++ QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ // Reverse the profile list. ++ std::reverse(profiles.begin(), profiles.end()); ++ const QString libdir = QString::fromLatin1("/lib/"); ++ Q_FOREACH (const QByteArray &profile, profiles) { ++ if (!profile.isEmpty()) { ++ l.setFileName(QFile::decodeName(profile) + libdir + libpath); ++ if (l.load()) break; ++ } + } + } else { + l.load(); |