diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
commit | 692d219a9312fbe3f8b34858a7ca0e32fb72bd07 (patch) | |
tree | 4c0f5e46b2cf639e71acb43990697d769a969d2c /pkgs/development/libraries/x265 | |
parent | c1a0aa7eb73f86b0224a57671752673befe08953 (diff) | |
parent | 82390e264704e4e1bf1652c9bebdc30a48f7fd07 (diff) | |
download | nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.gz nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.bz2 nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.lz nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.xz nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.zst nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/x265')
-rw-r--r-- | pkgs/development/libraries/x265/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 714e31521ec..ad43ac96d7d 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -21,6 +21,8 @@ let (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" ]; version = "3.4"; |