From b552aae1fb0633072f5f3422a2c593a6652e622b Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:34:51 +0100 Subject: [PATCH] bash-env-json: fix path issue --- pkgs/by-name/ba/bash-env-json/package.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ba/bash-env-json/package.nix b/pkgs/by-name/ba/bash-env-json/package.nix index 895a6822a0ce7..0034f7e0d8bc8 100644 --- a/pkgs/by-name/ba/bash-env-json/package.nix +++ b/pkgs/by-name/ba/bash-env-json/package.nix @@ -1,7 +1,6 @@ { stdenvNoCC, lib, - makeWrapper, fetchFromGitHub, coreutils, gnused, @@ -11,19 +10,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bash-env-json"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "tesujimath"; repo = "bash-env-json"; rev = finalAttrs.version; - hash = "sha256-cZEkYOr9z6yLPA4PSo6+hogaqb1vhWaYi/rp4asfsbM="; + hash = "sha256-EYro4pMILnQFpXpFjdzSDuudhqC2EvysYMUmIOvesgo="; }; - nativeBuildInputs = [ - makeWrapper - ]; - installPhase = '' runHook preInstall @@ -33,13 +28,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; postFixup = '' - wrapProgram $out/bin/bash-env-json --prefix PATH : ${ - lib.makeBinPath [ - coreutils - gnused - jq - ] - } + substituteInPlace $out/bin/bash-env-json --replace-fail " env " " ${lib.getExe' coreutils "env"} " + substituteInPlace $out/bin/bash-env-json --replace-fail " jq " " ${lib.getExe jq} " + substituteInPlace $out/bin/bash-env-json --replace-fail " mktemp " " ${lib.getExe' coreutils "mktemp"} " + substituteInPlace $out/bin/bash-env-json --replace-fail " rm " " ${lib.getExe' coreutils "rm"} " + substituteInPlace $out/bin/bash-env-json --replace-fail " sed " " ${lib.getExe gnused} " + substituteInPlace $out/bin/bash-env-json --replace-fail " touch " " ${lib.getExe' coreutils "touch"} " ''; passthru.updateScript = nix-update-script { };