diff options
| author | Yaroslav Bolyukin <iam@lach.pw> | 2021-02-17 18:59:43 +0300 |
|---|---|---|
| committer | Yaroslav Bolyukin <iam@lach.pw> | 2021-02-26 05:50:21 +0300 |
| commit | 47d5bebf6764dacd2dc277b80ba4667eaae91d74 (patch) | |
| tree | 07c536d367ae1cb0a459ccb8743b900ff64aefb2 | |
| parent | 15fd83232c18905be84b477425cd5856ce5b6d35 (diff) | |
| download | nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.tar nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.tar.gz nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.tar.bz2 nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.tar.lz nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.tar.xz nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.tar.zst nixpkgs-47d5bebf6764dacd2dc277b80ba4667eaae91d74.zip | |
kinit: upgrade patches
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch index 21477394c91..a3e4014df50 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch @@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644 - // 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 "/"); +- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/"); - QString orig_libpath = libpath; - libpath = install_lib_dir + libpath; - l.setFileName(libpath); diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch index bf25b98d6c5..3728c3c58b8 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch @@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644 #include <string.h> #include <unistd.h> --#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +#define EXECUTE "/run/wrappers/bin/start_kdeinit" #if KDEINIT_OOM_PROTECT diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch index 9df8505b292..499c975a9e2 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch @@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644 -// Completely unrelated to plugins. -static QString findSharedLib(const QString &lib) -{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; +- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib; - if (QFile::exists(path)) { - return path; - } |