diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-10-24 22:08:36 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-10-24 22:09:56 +0200 |
commit | 7c6f4a8169c9360e543f56a657082a8aabc21d1b (patch) | |
tree | 9e99a3be57e039294eeff1cf1f1c79fe2e1ac3b8 /pkgs/development/libraries/x265 | |
parent | 88ebc5e7ad3def65d767d347d48cbc9f069098cb (diff) | |
download | nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.tar nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.tar.gz nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.tar.bz2 nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.tar.lz nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.tar.xz nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.tar.zst nixpkgs-7c6f4a8169c9360e543f56a657082a8aabc21d1b.zip |
x265: fix aarch64 build
Diffstat (limited to 'pkgs/development/libraries/x265')
-rw-r--r-- | pkgs/development/libraries/x265/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index ad43ac96d7d..9d501f47c3b 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" |