From ed8c856ebfc87f211e60c1699e091c39540e93b1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:30:58 +0300 Subject: [PATCH] kdePackages.plasma-workspace: fix substituteAll usage --- pkgs/kde/plasma/plasma-workspace/default.nix | 4 ++-- pkgs/kde/plasma/plasma-workspace/dependency-paths.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 2dd596efffa5..6225f7c3b77c 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -24,8 +24,8 @@ mkKdeDerivation { patches = [ (substituteAll { src = ./dependency-paths.patch; - dbus-send = lib.getExe' dbus "dbus-send"; - fc-match = lib.getExe' fontconfig "fc-match"; + dbusSend = lib.getExe' dbus "dbus-send"; + fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; xmessage = lib.getExe xorg.xmessage; diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index d84e6dda7278..561655dde280 100644 --- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -46,7 +46,7 @@ index f5034455c9..8ea57813a1 100644 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"@fcMatch@"_s, args); } void CFcQuery::procExited() @@ -143,5 +143,5 @@ index 1e903130a9..1d807a8526 100644 [Service] 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=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready Slice=session.slice