make self-contained

nix-community · Dec 14, 2023 · f211f25 · f211f25
1 parent fc1c760
commit f211f25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/default.nix b/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, nix, lib }:
+{ stdenv, nix, lib, coreutils, direnv }:
 
 stdenv.mkDerivation {
   name = "nix-direnv";
 
   src = ./.;
 
   postPatch = ''
-    sed -i "2iNIX_BIN_PREFIX=${nix}/bin" direnvrc
+    sed -i '2iBIN_PREFIX="${nix}/bin ${coreutils}/bin ${direnv}/bin"' direnvrc
   '';
 
   installPhase = ''

diff --git a/direnvrc b/direnvrc
@@ -58,8 +58,9 @@ _nix_direnv_preflight () {
     _nix_direnv_fatal "\$direnv environment variable was not defined. Was this script run inside direnv?"
   fi
 
-  if [[ -n ${NIX_BIN_PREFIX:-} ]]; then
-    PATH_add "$NIX_BIN_PREFIX"
+  if [[ -n "${BIN_PREFIX:-}" ]]; then
+    # shellcheck disable=2086
+    PATH_add $BIN_PREFIX
   fi
 
   # check command min versions, bash check uses $BASH_VERSION with _require_version