Unverified Commit 480de8d5 authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #283371 from emilylange/chromium 

chromium: 120.0.6099.109 -> 121.0.6167.85, google-chrome: unbreak build in M121
parents 399fcb60 8a3a274c

pkgs/applications/networking/browsers/chromium/common.nix

+12 −0
Original line number Diff line number Diff line
@@ -236,6 +236,18 @@ let 
        commit = "b9bef8e9555645fc91fab705bec697214a39dbc1";

        hash = "sha256-CJ1v/qc8+nwaHQR9xsx08EEcuVRbyBfCZCm/G7hRY+4=";

      })

    ] ++ lib.optionals (chromiumVersionAtLeast "121") [

      # M121 is the first version to require the new rust toolchain.

      # But we don't have that ready yet.

      # So we have to revert the singular commit that requires rust toolchain.

      # This works, because the code in question, the QR code generator, is present in

      # two variants: c++ and rust. This workaround will not last.

      # The c++ variant in question is deemed to be removed in a month (give or take).

      (githubPatch {

        revert = true;

        commit = "bcf739b95713071687ff25010683248de0092f6a";

        hash = "sha256-1ZPe45cc2bjnErcF3prbLMlYpU7kpuwDVcjewINQr+Q=";

      })

    ];



    postPatch = ''

pkgs/applications/networking/browsers/chromium/upstream-info.nix

+10 −10
Original line number Diff line number Diff line 
{

  stable = {

    chromedriver = {

      hash_darwin = "sha256-20OgLWrtw2QwyfoehoU7WjmH3IoOG4k3dAya5U5c7Qc=";

      hash_darwin = "sha256-IDPdjq3FpLy6Y9xkR15mzbIal8wjeQzzWtWuZ4uKmzA=";

      hash_darwin_aarch64 =

        "sha256-7aI141Ndtun3HglNKiW4+TTVgOVASnz98Rn1trgUgpo=";

      hash_linux = "sha256-gJ6xXhW87URDvpFP88KgLKmwoFDlqMN1Vj6L+bDdbSc=";

      version = "120.0.6099.109";

        "sha256-3Mol45MrvrSqrpkKy2Trt0JFNfV4ekXTxEveUUGmJm4=";

      hash_linux = "sha256-O8U4pZ76/N7q9bV7d0A+wlIqqaoz6WyfZQO4cIV2CIM=";

      version = "121.0.6167.85";

    };

    deps = {

      gn = {

        hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=";

        rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";

        hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s=";

        rev = "7367b0df0a0aa25440303998d54045bda73935a5";

        url = "https://gn.googlesource.com/gn";

        version = "2023-10-23";

        version = "2023-11-28";

      };

    };

    hash = "sha256-HFQ7QAL4hcux3jmMmLYFNym3sfWR1o1hWV75bokID4I=";

    hash_deb_amd64 = "sha256-dFllEHRYH3yAPg3uaaCzdpiZxSLENEwmtIb/gg53/ZU=";

    version = "120.0.6099.224";

    hash = "sha256-2TMTLCqoCxdy9PDlZIUa/5oXjmim1T2/LJu+3/Kf4fQ=";

    hash_deb_amd64 = "sha256-9vPQAiZPw60oILm0He4Iz9lOc+WvtHCBE9CHA1ejc7s=";

    version = "121.0.6167.85";

  };

  ungoogled-chromium = {

    deps = {

pkgs/applications/networking/browsers/google-chrome/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ in stdenv.mkDerivation { 
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \

      --add-flags ${lib.escapeShellArg commandLineArgs}



    for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do

    for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary}}; do

      patchelf --set-rpath $rpath $elf

      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf

    done