Revert "rav1e: remove build-time dependency on libgit2" revert-355325-rav1e-remove-libgit

1 files changed, 21 insertions, 12 deletions

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 523b8e1de6a0..e8834ac131e4 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -4,10 +4,15 @@
   stdenv,
   rustPlatform,
   fetchCrate,
+  pkg-config,
   cargo-c,
+  darwin,
+  libgit2,
+  libiconv,
   nasm,
   nix-update-script,
   testers,
+  zlib,
   rav1e,
 }:
 
@@ -22,24 +27,28 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY=";
 
+  depsBuildBuild = [ pkg-config ];
+
   nativeBuildInputs = [
     cargo-c
+    libgit2
     nasm
   ];
 
-  postPatch =
-    ''
-      # remove feature that requires libgit2 and is only used to print a version string
-      substituteInPlace Cargo.toml --replace-fail '"git_version",' ""
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-      # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
-      # and linking it with cctools ld64.
-      substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
+  buildInputs =
+    [ zlib ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+      darwin.apple_sdk.frameworks.Security
+    ];
 
-      # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
-      substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
-    '';
+  # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
+  # and linking it with cctools ld64.
+  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+    substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
+    # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
+    substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
+  '';
 
   checkType = "debug";