Skip to content

Commit

Permalink
chromiumBeta: Fix the configuration phase
Browse files Browse the repository at this point in the history
The changes from chromiumDev (see 029a5de) are required for
chromiumBeta as well.

(cherry picked from commit 1d38f6b)
  • Loading branch information
primeos committed Jun 10, 2020
1 parent 159c6a7 commit 48f3b97
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/chromium/common.nix
Expand Up @@ -74,7 +74,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;
Expand All @@ -89,7 +89,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;
Expand Down Expand Up @@ -219,7 +219,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;
Expand Down

0 comments on commit 48f3b97

Please sign in to comment.