diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-02-11 23:31:38 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2024-02-29 18:54:37 +0100 |
commit | bb82aa1c0cb619f89a7a66924797de1652d217e3 (patch) | |
tree | 079001828c149ae0dd2ccf98ab87b955f2112dea /pkgs/applications/version-management | |
parent | 4f4287521b83d236c0ae6c6032220c22c8a96bdd (diff) |
git-dive: unpin libgit2
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-dive/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index 983d7b3dd672c..c0209c38cfa9e 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config - # libgit2-sys doesn't support libgit2 1.6 yet -, libgit2_1_5 +, libgit2 , oniguruma , zlib , stdenv @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 oniguruma zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -54,7 +53,10 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@example.com ''; - RUSTONIG_SYSTEM_LIBONIG = true; + env = { + LIBGIT2_NO_VENDOR = 1; + RUSTONIG_SYSTEM_LIBONIG = true; + }; meta = with lib; { description = "Dive into a file's history to find root cause"; |