diff options
| author | toonn <toonn@toonn.io> | 2023-06-14 22:36:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 22:36:27 +0200 |
| commit | 50512e605433302fa1261c0c801546e9fca6d643 (patch) | |
| tree | 452bed17bebd93f5cd8cc86cc2888f2bb7994a3f | |
| parent | d206bcd142a66592a93fc9c73a571e4dcae70c2c (diff) | |
| parent | 98939130b9f97ad4c2c7d28e36da0ce58c5de4de (diff) | |
| download | nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.tar nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.tar.gz nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.tar.bz2 nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.tar.lz nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.tar.xz nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.tar.zst nixpkgs-50512e605433302fa1261c0c801546e9fca6d643.zip | |
Merge pull request #234868 from reckenrode/rav1e-cctools
rav1e: fix build with updated Darwin stdenv
| -rw-r--r-- | pkgs/tools/video/rav1e/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index b5b66ec3475..b7ca158d2e7 100644 --- 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 = '' |