diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-02-19 13:01:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-19 13:01:18 +0100 |
| commit | d45d19aa13082f32496d46ecc43bb19be05cf01d (patch) | |
| tree | 64c12b18f97a40090259640b0e2d578dcf7b52d2 /pkgs/tools/misc | |
| parent | b310f4915d350853d66cf3cec2762a25e4168647 (diff) | |
| parent | 349b8cfd36a18088c69b8256d78939a4a7ff3a7d (diff) | |
Merge pull request #113679 from adisbladis/nix-direnv-paths
nix-direnv: Fix nix executable paths
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/nix-direnv/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 6aaf8cc8a523e..833f8313f6172 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 = '' |