From 7c6f4a8169c9360e543f56a657082a8aabc21d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Oct 2020 22:08:36 +0200 Subject: [PATCH] x265: fix aarch64 build --- pkgs/development/libraries/x265/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index ad43ac96d7df..9d501f47c3b1 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals is64bit [ + ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON"