From 349b8cfd36a18088c69b8256d78939a4a7ff3a7d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 19 Feb 2021 11:52:28 +0100 Subject: [PATCH] nix-direnv: Fix nix executable paths Match the upstream change in: https://github.com/nix-community/nix-direnv/commit/991ea66bb86f5f188f4d5292aa2283458436b5b1 --- pkgs/tools/misc/nix-direnv/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 6aaf8cc8a52..833f8313f61 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { # getting sourced, not executed: postPatch = '' substituteInPlace direnvrc \ - --replace "grep" "${gnugrep}/bin/grep" \ - --replace "nix-shell" "${nix}/bin/nix-shell" \ - --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + --replace "\''${NIX_BIN_PREFIX:-}" "\''${NIX_BIN_PREFIX:-${nix}/bin/}" \ + --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = ''