JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chromiumBeta: Fix the configuration phase

Browse Source 
The changes from chromiumDev (see 029a5de083) are required for
chromiumBeta as well.
This commit is contained in:
Michael Weiss 2020-06-08 13:55:34 +02:00
parent ac44b7f958
commit 1d38f6bcb2
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -80,7 +80,7 @@ let
# "ffmpeg" # https://crbug.com/731766
# "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
] ++ optional (upstream-info.channel != "dev") "yasm";
] ++ optional (versionRange "0" "84") "yasm";
opusWithCustomModes = libopus.override {
withCustomModes = true;
@ -95,7 +95,7 @@ let
ffmpeg libxslt libxml2
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]);
] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]);
# build paths and release info
packageName = extraAttrs.packageName or extraAttrs.name;
@ -226,7 +226,7 @@ let
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
'';
gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") {
gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") {
linux_use_bundled_binutils = false;
} // {
use_lld = false;