Merge pull request #234868 from reckenrode/rav1e-cctools

rav1e: fix build with updated Darwin stdenv
NixOS · Jun 14, 2023 · 50512e6 · 50512e6
2 parents d206bcd + 9893913
commit 50512e6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
@@ -55,6 +55,12 @@ in rustPlatform.buildRustPackage rec {
     Security
   ];
 
+  # 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.isDarwin && stdenv.isx86_64) ''
+    substituteInPlace build.rs --replace 'cmd.arg("-x")' 'cmd.arg("-S")'
+  '';
+
   checkType = "debug";
 
   postBuild =  ''