From d6631f6bda45f58ae767dc14628ff2c3fcb21b98 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 10 Mar 2025 09:45:27 -0400
Subject: [PATCH] s0ix-selftest-tool: switch to makeBinPath

---
 pkgs/by-name/s0/s0ix-selftest-tool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix
index b607fcc861f6..95f2ec060c2a 100644
--- a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix
+++ b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix
@@ -19,7 +19,7 @@
 }:
 
 let
-  deps = [
+  deps = lib.makeBinPath [
     acpica-tools
     bc
     coreutils
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
 
   # don't use the bundled turbostat binary
   postPatch = ''
-    substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat'
+    substituteInPlace s0ix-selftest-tool.sh --replace-fail '"$DIR"/turbostat' 'turbostat'
   '';
 
   nativeBuildInputs = [ makeWrapper ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
     install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool"
-    wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${lib.escapeShellArg deps}
+    wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${deps}
     runHook postInstall
   '';