Merge pull request #101594 from Mic92/x265-aarch64

x265: fix linux-aarch64 build
This commit is contained in:
Jörg Thalheim
2020-10-25 20:58:11 +01:00
committed by GitHub
+1 -1
View File
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
"-DENABLE_SHARED=ON" "-DENABLE_SHARED=ON"
"-DHIGH_BIT_DEPTH=OFF" "-DHIGH_BIT_DEPTH=OFF"
"-DENABLE_HDR10_PLUS=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" "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
"-DLINKED_10BIT=ON" "-DLINKED_10BIT=ON"
"-DLINKED_12BIT=ON" "-DLINKED_12BIT=ON"