gex:fix build

This commit is contained in:
wxt 2024-09-04 21:10:06 +08:00 committed by Alyssa Ross
parent 3ad5852e0a
commit 3d25f1f612
2 changed files with 65 additions and 3 deletions

View File

@ -6,6 +6,7 @@
pkg-config,
libgit2,
darwin,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@ -21,6 +22,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
passthru.updateScript = nix-update-script { };
buildInputs =
[
libgit2
@ -29,10 +32,15 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Security
];
# force the libgit2-sys crate to use the system libgit2 library
LIBGIT2_NO_VENDOR = 1;
env = {
LIBGIT2_NO_VENDOR = 1;
};
cargoHash = "sha256-HNz1wwn0eUhNR6ZLLPMse8LmAS4CzADx0ZR9gJgJQCg=";
cargoPatches = [
./patch-libgit2.patch
];
cargoHash = "sha256-GEQ4Zv14Dzo9mt1YIDmXEBHLPD6G0/O1ggmUTnSYD+k=";
meta = with lib; {
description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";

View File

@ -0,0 +1,54 @@
From 3f9183a4de984c5d24caa9379274461e369926ed Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 8 Sep 2024 18:36:46 +0800
Subject: [PATCH] tt
---
Cargo.lock | 8 ++++----
Cargo.toml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 5101c2e..0cb59d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -246,9 +246,9 @@ dependencies = [
[[package]]
name = "git2"
-version = "0.18.1"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
dependencies = [
"bitflags 2.3.3",
"libc",
@@ -316,9 +316,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libgit2-sys"
-version = "0.16.1+1.7.1"
+version = "0.17.0+1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
dependencies = [
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index 26cef3f..f947945 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ anyhow = "1.0.75"
clap = { version = "4.4.7", features = ["cargo", "derive"] }
crossterm = { version = "0.27.0", features = ["serde"] }
dirs = "5.0.1"
-git2 = { version = "0.18.1", default-features = false }
+git2 = { version = "0.19.0", default-features = false }
itertools = "0.11.0"
nom = "7.1.3"
paste = "1.0.14"
--
2.46.0