pyrox.dev / nixpkgs
lol
fork atom

kdePackages.plasma-workspace: fix substituteAll usage

K900 ed8c856e 687aa99a

+4 -4
unified split
+2 -2
pkgs/kde/plasma/plasma-workspace/default.nix
··· 24 patches = [ 25 (substituteAll { 26 src = ./dependency-paths.patch; 27 - dbus-send = lib.getExe' dbus "dbus-send"; 28 - fc-match = lib.getExe' fontconfig "fc-match"; 29 lsof = lib.getExe lsof; 30 qdbus = lib.getExe' qttools "qdbus"; 31 xmessage = lib.getExe xorg.xmessage;
··· 24 patches = [ 25 (substituteAll { 26 src = ./dependency-paths.patch; 27 + dbusSend = lib.getExe' dbus "dbus-send"; 28 + fcMatch = lib.getExe' fontconfig "fc-match"; 29 lsof = lib.getExe lsof; 30 qdbus = lib.getExe' qttools "qdbus"; 31 xmessage = lib.getExe xorg.xmessage;
+2 -2
pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
··· 46 connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); 47 48 - m_proc->start(u"fc-match"_s, args); 49 - + m_proc->start(u"@fc-match@"_s, args); 50 } 51 52 void CFcQuery::procExited() ··· 143 [Service] 144 Type=oneshot 145 -ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready 146 - +ExecStart=@dbus-send@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready 147 Slice=session.slice
··· 46 connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); 47 48 - m_proc->start(u"fc-match"_s, args); 49 + + m_proc->start(u"@fcMatch@"_s, args); 50 } 51 52 void CFcQuery::procExited() ··· 143 [Service] 144 Type=oneshot 145 -ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready 146 + +ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready 147 Slice=session.slice