diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5b77551640e..6e3c0ee65e7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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;