rav1e: fix clang-19 using system libgit2 / zlib
update the unnecessary `built` package so we can use the system libgit2 and zlib which fixes the clang-19 build
This commit is contained in:
@@ -6,13 +6,11 @@
|
||||
fetchCrate,
|
||||
pkg-config,
|
||||
cargo-c,
|
||||
darwin,
|
||||
libgit2,
|
||||
libiconv,
|
||||
nasm,
|
||||
libgit2,
|
||||
zlib,
|
||||
nix-update-script,
|
||||
testers,
|
||||
zlib,
|
||||
rav1e,
|
||||
}:
|
||||
|
||||
@@ -25,22 +23,22 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY=";
|
||||
# update built to be able to use the system libgit2
|
||||
cargoPatches = [ ./update-built.diff ];
|
||||
cargoHash = "sha256-Ud9Vw31y8nLo0aC3j7XY1+mN/pRvH9gJ0uIq73hKy3Y=";
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
libgit2
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-c
|
||||
libgit2
|
||||
nasm
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ zlib ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
env.LIBGIT2_NO_VENDOR = 1;
|
||||
|
||||
# Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
|
||||
# and linking it with cctools ld64.
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 6825377..8512eba 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -242,9 +242,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "built"
|
||||
-version = "0.7.1"
|
||||
+version = "0.7.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53"
|
||||
+checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
|
||||
dependencies = [
|
||||
"git2",
|
||||
]
|
||||
@@ -633,9 +633,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
|
||||
|
||||
[[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.4.1",
|
||||
"libc",
|
||||
@@ -845,9 +845,9 @@ dependencies = [
|
||||
|
||||
[[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",
|
||||
Reference in New Issue
Block a user