dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

kdePackages.plasma-workspace: fix substituteAll usage

Browse Source
This commit is contained in:
K900 2024-10-20 18:30:58 +03:00
parent 687aa99ad2
commit ed8c856ebf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/kde/plasma/plasma-workspace/default.nix
View File

@ -24,8 +24,8 @@ mkKdeDerivation {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./dependency-paths.patch; src = ./dependency-paths.patch;
dbus-send = lib.getExe' dbus "dbus-send"; dbusSend = lib.getExe' dbus "dbus-send";
fc-match = lib.getExe' fontconfig "fc-match"; fcMatch = lib.getExe' fontconfig "fc-match";
lsof = lib.getExe lsof; lsof = lib.getExe lsof;
qdbus = lib.getExe' qttools "qdbus"; qdbus = lib.getExe' qttools "qdbus";
xmessage = lib.getExe xorg.xmessage; xmessage = lib.getExe xorg.xmessage;

4
pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
View File

@ -46,7 +46,7 @@ index f5034455c9..8ea57813a1 100644
connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data);
- m_proc->start(u"fc-match"_s, args); - m_proc->start(u"fc-match"_s, args);
+ m_proc->start(u"@fc-match@"_s, args); + m_proc->start(u"@fcMatch@"_s, args);
} }
void CFcQuery::procExited() void CFcQuery::procExited()
@ -143,5 +143,5 @@ index 1e903130a9..1d807a8526 100644
[Service] [Service]
Type=oneshot Type=oneshot
-ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready -ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
+ExecStart=@dbus-send@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready +ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
Slice=session.slice Slice=session.slice