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()) { r> Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/build-aux/build-self.scm
AgeCommit message (Expand)Author
2024-07-18guix: channels: Enable specifiying available builtin builders....When computing channel instance derivations. This is useful when you want to generate compatible derivations that can be run with a daemon that potentially doesn't support builtin builders that the daemon you're using to generate the derivations has. I'm looking at this in particular because I want to use this in the data service, since it provides substitutes for derivations, and since these can be built on other machines, it's useful to control which builtin builders they depend on. Fixes: <https://issues.guix.gnu.org/67250>. * build-aux/build-self.scm (build-program): Accept #:built-in-builders and pass along to port->connection or open-connection as approriate. (build): Accept and pass on #:built-in-builders. * guix/channels.scm (build-from-source, build-channel-instance, channel-instance-derivations, channel-instances->manifest, channel-instances->derivation): Accept and pass on #:built-in-builders. Change-Id: I315c990de66c6f7dca25a859165a5568abe385ea Christopher Baines