nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix-direnv: Update resholve solutions from upstream

Browse Source 
Upstream recently changed their resholve solutions somewhat to support
using the ambient Nix on the user's `$PATH` or falling back to the
default nixpkgs stable `nix` otherwise. Let's update our definitions to
match.

See: https://github.com/nix-community/nix-direnv/pull/513
This commit is contained in:
Rebecca Turner 2024-09-03 15:10:48 -07:00
parent a4626d4bc8
commit ea8ab50f9e
No known key found for this signature in database
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/by-name/ni/nix-direnv/package.nix
View File

@ -1,4 +1,11 @@
{ resholve, lib, coreutils, direnv, nix, fetchFromGitHub }:
{
resholve,
lib,
coreutils,
nix,
fetchFromGitHub,
writeText,
}:
# resholve does not yet support `finalAttrs` call pattern hence `rec`
# https://github.com/abathur/resholve/issues/107
@ -13,11 +20,6 @@ resholve.mkDerivation rec {
hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw=";
};
# skip min version checks which are redundant when built with nix
postPatch = ''
sed -i 1iNIX_DIRENV_SKIP_VERSION_CHECK=1 direnvrc
'';
installPhase = ''
runHook preInstall
install -m400 -D direnvrc $out/share/nix-direnv/direnvrc
@ -28,7 +30,7 @@ resholve.mkDerivation rec {
default = {
scripts = [ "share/nix-direnv/direnvrc" ];
interpreter = "none";
inputs = [ coreutils nix ];
inputs = [ coreutils ];
fake = {
builtin = [
"PATH_add"
@ -43,23 +45,36 @@ resholve.mkDerivation rec {
# cannot be reached when built with nix
"shasum"
];
external = [
# We want to reference the ambient Nix when possible, and have custom logic
# for the fallback
"nix"
];
};
keep = {
"$cmd" = true;
"$direnv" = true;
# Nix fallback implementation
"$_nix_direnv_nix" = true;
"$ambient_nix" = true;
"$NIX_DIRENV_FALLBACK_NIX" = true;
};
execer = [
"cannot:${direnv}/bin/direnv"
"cannot:${nix}/bin/nix"
];
prologue =
(writeText "prologue.sh" ''
NIX_DIRENV_FALLBACK_NIX=''${NIX_DIRENV_FALLBACK_NIX:-${lib.getExe nix}}
'').outPath;
};
};
meta = {
description = "Fast, persistent use_nix implementation for direnv";
homepage = "https://github.com/nix-community/nix-direnv";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ mic92 bbenne10 ];
homepage = "https://github.com/nix-community/nix-direnv";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
mic92
bbenne10
];
};
}