git.iko.soy/typeable/nixpkgs
on master help sign in
chromiumDev: Fix the configuration phase

Relevant changes in M85: - Upstream switched from YASM to NASM [0]. - third_party/binutils was removed [1]. Note: The gn and dev channel updates are optional. cc #89615. [0]: https://bugs.chromium.org/p/chromium/issues/detail?id=766721 [1]: https://github.com/chromium/chromium/commit/9869e86fd9079a6ab4ea23aa03d724580678b356

commit029a5de08390bb03c3f44230b064fd1850c6658a authorMichael Weiss <dev.primeos@gmail.com> dateSat 6 Jun 2020, 18:43 (6 years ago) parent6bac500
3 files changed+19−9
pkgs/applications/networking/browsers/chromium/common.nix+7−6 pkgs/applications/networking/browsers/chromium/default.nix+9 pkgs/applications/networking/browsers/chromium/upstream-info.nix+3−3
pkgs/applications/networking/browsers/chromium/common.nix+7−6
@@ -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";
pkgs/applications/networking/browsers/chromium/default.nix+9
@@ -43,6 +43,15 @@ let
4343 sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
4444 };
4545 });
46+ } // lib.optionalAttrs (channel == "dev") {
47+ gnChromium = gn.overrideAttrs (oldAttrs: {
48+ version = "2020-05-19";
49+ src = fetchgit {
50+ url = "https://gn.googlesource.com/gn";
51+ rev = "d0a6f072070988e7b038496c4e7d6c562b649732";
52+ sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
53+ };
54+ });
4655 });
4756
4857 browser = callPackage ./browser.nix { inherit channel enableWideVine; };
pkgs/applications/networking/browsers/chromium/upstream-info.nix+3−3
@@ -6,9 +6,9 @@
66 version = "84.0.4147.38";
77 };
88 dev = {
9− sha256 = "04jbh8bsvqkm8mdsgyv0465fq5lhz0nn0mcs07kj5hnmzx1g2f3a";
10− sha256bin64 = "0d9knpqbps06wgfgp2s7z693dqiip0m771mv3j2856h5v9rv210l";
11− version = "85.0.4158.4";
9+ sha256 = "07h3i4ab7yj05ndrqchzf3f9wr809qb3dj2gfc1653mkjmba8h07";
10+ sha256bin64 = "10jdq5mr7qby0m26l5lbsqcbh9bhjdpmpbkkcvv9wm2259rwjxr5";
11+ version = "85.0.4164.2";
1212 };
1313 stable = {
1414 sha256 = "10vg0fmwlkzpnixhhhcwccxshqdfq7rh0ribij7wgkw42bv0bi0j";