ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge #206230: x265: only disable assembly on riscv-cross builds

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2022-12-16 11:21:59 +01:00
commit cb835f1071
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/x265/default.nix
View File

@ -35,8 +35,7 @@ let
(mkFlag vtuneSupport "ENABLE_VTUNE") (mkFlag vtuneSupport "ENABLE_VTUNE")
(mkFlag werrorSupport "WARNINGS_AS_ERRORS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
# Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag
(mkFlag (with stdenv; !(isCross && hostPlatform.isRiscV || isDarwin && isAarch64)) "ENABLE_ASSEMBLY") ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF";
];
cmakeStaticLibFlags = [ cmakeStaticLibFlags = [
"-DHIGH_BIT_DEPTH=ON" "-DHIGH_BIT_DEPTH=ON"