@@ -4,7 +4,7 @@
44, bzip2, flac, speex, libopus
55, libevent, expat, libjpeg, snappy
66, libpng, libcap
7−, xdg_utils, yasm, minizip, libwebp
7+, xdg_utils, yasm, nasm, minizip, libwebp
88, libusb1, pciutils, nss, re2, zlib
99
1010, python2Packages, perl, pkgconfig
@@ -72,14 +72,14 @@ let
7272 in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
7373
7474 gnSystemLibraries = [
75− "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng"
75+ "flac" "libwebp" "libxslt" "opus" "snappy" "libpng"
7676 # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config
7777 # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
7878 # "re2" # fails with linker errors
7979 # "ffmpeg" # https://crbug.com/731766
8080 # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
8181 # so we can't build with one from system and other from source
82− ];
82+ ] ++ optional (upstream-info.channel != "dev") "yasm";
8383
8484 opusWithCustomModes = libopus.override {
8585 withCustomModes = true;
@@ -89,12 +89,12 @@ let
8989 bzip2 flac speex opusWithCustomModes
9090 libevent expat libjpeg snappy
9191 libpng libcap
92− xdg_utils yasm minizip libwebp
92+ xdg_utils minizip libwebp
9393 libusb1 re2 zlib
9494 ffmpeg libxslt libxml2
9595 # harfbuzz # in versions over 63 harfbuzz and freetype are being built together
9696 # so we can't build with one from system and other from source
97− ];
97+ ] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]);
9898
9999 # build paths and release info
100100 packageName = extraAttrs.packageName or extraAttrs.name;
@@ -224,8 +224,9 @@ let
224224 ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
225225 '';
226226
227− gnFlags = mkGnFlags ({
227+ gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") {
228228 linux_use_bundled_binutils = false;
229+ } // {
229230 use_lld = false;
230231 use_gold = true;
231232 gold_path = "${stdenv.cc}/bin";