From c4a07c3c0afe821f04d364e5c3ed5ca02f456f8a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 9 Aug 2024 22:38:09 +0100 Subject: [PATCH] x265: fix build on aarch64 Before the change we enabled arm32 code on arm64 targets. After the change we have them separate. --- pkgs/development/libraries/x265/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index b0d6fc09c709..e58e910c2bba 100644 --- 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