x265: fix cross-compiling to armv7 (#339822)

2024-09-06 05:10:36 +02:00
parent ae73301ada 61cfeab4dd
commit 243b7dde35
1 changed files with 3 additions and 5 deletions
@@ -79,6 +79,9 @@ stdenv.mkDerivation rec {
    "-DEXPORT_C_API=OFF"
  ] ++ lib.optionals stdenv.hostPlatform.isPower [
    "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
+  ] ++ lib.optionals isCross [
+    (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
+    (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
  ];

  preConfigure = lib.optionalString multibitdepthSupport ''
@@ -99,11 +102,6 @@ stdenv.mkDerivation rec {
      ${mkFlag cliSupport "ENABLE_CLI"}
      ${mkFlag unittestsSupport "ENABLE_TESTS"}
    )
-  '' + lib.optionalString isCross ''
-    cmakeFlagsArray+=(
-      ${mkFlag (stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
-      ${mkFlag (stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
-    )
  '';

  # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted