diff options
author | Marius Bakke <[email protected]> | 2022-09-01 23:26:57 +0200 |
---|---|---|
committer | Marius Bakke <[email protected]> | 2022-09-01 23:26:57 +0200 |
commit | 58863b93b0d9a191d5cca695fe0a0dfbb067ebba (patch) | |
tree | 1ee1aba5905862aaee952689e59dd2d8a9e2fce6 /gnu/packages/patches/kdbusaddons-kinit-file-name.patch | |
parent | 2e559a358582fd8f56a035d0fac97be229752dfb (diff) | |
parent | 0c518f974e64f23846ae51ea2c68b479202fdca9 (diff) |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/kdbusaddons-kinit-file-name.patch')
-rw-r--r-- | gnu/packages/patches/kdbusaddons-kinit-file-name.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gnu/packages/patches/kdbusaddons-kinit-file-name.patch b/gnu/packages/patches/kdbusaddons-kinit-file-name.patch deleted file mode 100644 index ffed88e043..0000000000 --- a/gnu/packages/patches/kdbusaddons-kinit-file-name.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add placeholder for kinit's store file name. - -diff --git a/src/kdeinitinterface.cpp b/src/kdeinitinterface.cpp -index 22fa5e5..3d40937 100644 ---- a/src/kdeinitinterface.cpp -+++ b/src/kdeinitinterface.cpp -@@ -52,7 +52,7 @@ void KDEInitInterface::ensureKdeinitRunning() - // If not found in system paths, search other paths - if (srv.isEmpty()) { - const QStringList searchPaths = QStringList() -- << QCoreApplication::applicationDirPath() // then look where our application binary is located -+ << QString::fromUtf8("@SUBSTITUTEME@/bin") // using QStringLiteral would be more efficient, but breaks guix store reference detection. - << QLibraryInfo::location(QLibraryInfo::BinariesPath); // look where exec path is (can be set in qt.conf) - srv = QStandardPaths::findExecutable(QStringLiteral("kdeinit5"), searchPaths); - if (srv.isEmpty()) { |