Merge pull request #113679 from adisbladis/nix-direnv-paths

nix-direnv: Fix nix executable paths
This commit is contained in:
adisbladis 2021-02-19 13:01:18 +01:00 committed by GitHub
commit d45d19aa13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions

View File

@ -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 = ''