Unverified Commit d6631f6b authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

s0ix-selftest-tool: switch to makeBinPath

parent a47246c8
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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
  '';