nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 19:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

consistently use $direnv builtin

Browse source
This commit is contained in:
Arthur Noel 2023-12-19 19:43:10 +00:00
parent fe698c1af1
commit 9d4a2cf0a6
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
default.nix
View file

@ -24,7 +24,7 @@ resholve.mkDerivation rec {
default = {
scripts = [ "share/${pname}/direnvrc" ];
interpreter = "none";
inputs = [ coreutils direnv nix ];
inputs = [ coreutils nix ];
fake = {
builtin = [
"PATH_add"
@ -40,7 +40,10 @@ resholve.mkDerivation rec {
"shasum"
];
};
keep."$cmd" = true;
keep = {
"$cmd" = true;
"$direnv" = true;
};
execer = [
"cannot:${direnv}/bin/direnv"
"cannot:${nix}/bin/nix"

5
direnvrc
View file

@ -39,7 +39,8 @@ _nix() {
_require_version() {
local cmd=$1 version=$2 required=$3
if ! printf "%s\n" "$required" "$version" | sort --check=quiet --version-sort; then
_nix_direnv_fatal "minimum required $cmd version is $required (installed: $version)"
_nix_direnv_fatal \
"minimum required $(basename "$cmd") version is $required (installed: $version)"
fi
}
@ -219,7 +220,7 @@ _nix_direnv_watches() {
path=$(printf "$path")
_watches+=("$path")
fi
done < <(direnv show_dump "${DIRENV_WATCHES}")
done < <($direnv show_dump "${DIRENV_WATCHES}")
}
_nix_direnv_manual_reload=0