Merge pull request #334550 from trofi/x265-unify-cross

x265: move both `arm` `CROSS_COMPILE_*` under isCross
2024-08-18 01:15:30 +02:00
parent 150d965bfb bba26b6dfc
commit ee89137c4b
1 changed files with 2 additions and 2 deletions
@@ -96,13 +96,13 @@ stdenv.mkDerivation rec {
      ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"}
      -DHIGH_BIT_DEPTH=OFF
      -DENABLE_HDR10_PLUS=ON
-      ${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"}
+      ${mkFlag (stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
+      ${mkFlag (stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
    )
  '';