Merge pull request #333539 from trofi/x264-unbreak-arm64

x265: fix cross-compilation to aarch64
NixOS · Aug 10, 2024 · 4085c54 · 4085c54
2 parents 68894e5 + c4a07c3
commit 4085c54
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
@@ -92,10 +92,14 @@ stdenv.mkDerivation rec {
       ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"}
       -DHIGH_BIT_DEPTH=OFF
       -DENABLE_HDR10_PLUS=ON
-      ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"}
+      ${mkFlag (isCross && stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
       ${mkFlag cliSupport "ENABLE_CLI"}
       ${mkFlag unittestsSupport "ENABLE_TESTS"}
     )
+  '' + lib.optionalString isCross ''
+    cmakeFlagsArray+=(
+      ${mkFlag (isCross && stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
+    )
   '';
 
   # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted