Merge pull request #101594 from Mic92/x265-aarch64
x265: fix linux-aarch64 build
commit2257afa81db00642bca8d1cb1138e9cfcfeb9ac9
authorJörg Thalheim <Mic92@users.noreply.github.com>
dateSun 25 Oct 2020, 20:58 (6 years ago)
parentd2a28d37c6f4a8
pkgs/development/libraries/x265/default.nix+1−1
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
7979 "-DENABLE_SHARED=ON"
8080 "-DHIGH_BIT_DEPTH=OFF"
8181 "-DENABLE_HDR10_PLUS=OFF"
82− ] ++ stdenv.lib.optionals is64bit [
82+ ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [
8383 "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
8484 "-DLINKED_10BIT=ON"
8585 "-DLINKED_12BIT=ON"