diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-01 00:14:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 00:14:10 +0000 |
| commit | a1ed79952d0edc51a55931a28fba93fca0cf00fd (patch) | |
| tree | f3b3ffecba4907d35227c8d32bf20115a208817b /pkgs/tools/nix | |
| parent | 47e7b83fd1c8d5fdacf6a5a7a56a93b578a3e973 (diff) | |
| parent | a6a84940248f7ea903c9dfffbb777c558b6cfe3d (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/tools/nix')
| -rw-r--r-- | pkgs/tools/nix/nix-init/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index a50a7fc1a0d16..1e1ef3c0d0f68 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -6,7 +6,7 @@ , installShellFiles , pkg-config , bzip2 -, libgit2_1_6 +, libgit2 , openssl , zlib , zstd @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 curl - libgit2_1_6 + libgit2 openssl zlib zstd @@ -80,6 +80,7 @@ rustPlatform.buildRustPackage rec { env = { GEN_ARTIFACTS = "artifacts"; + LIBGIT2_NO_VENDOR = 1; NIX = lib.getExe nix; NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; |