Skip to content

Commit 3a9ca45

Browse files
s0ix-selftest-tool: switch to makeBinPath (NixOS#388688)
2 parents 467de20 + d6631f6 commit 3a9ca45

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkgs/by-name/s0/s0ix-selftest-tool/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}:
2020

2121
let
22-
deps = [
22+
deps = lib.makeBinPath [
2323
acpica-tools
2424
bc
2525
coreutils
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
4747

4848
# don't use the bundled turbostat binary
4949
postPatch = ''
50-
substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat'
50+
substituteInPlace s0ix-selftest-tool.sh --replace-fail '"$DIR"/turbostat' 'turbostat'
5151
'';
5252

5353
nativeBuildInputs = [ makeWrapper ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
5757
installPhase = ''
5858
runHook preInstall
5959
install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool"
60-
wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${lib.escapeShellArg deps}
60+
wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${deps}
6161
runHook postInstall
6262
'';
6363

0 commit comments

Comments
 (0)