Unverified Commit 927faecb authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #308358 from emilylange/chromium 

chromium: 124.0.6367.91 -> 124.0.6367.118, lower version range of `--ozone-platform-hint` patch
parents a41a4a43 85dfe83a

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

+2 −2
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ let 
      # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61

      # allowing us to use our rustc and our clang.

      ./patches/chromium-121-rust.patch

    ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [

      # M124 shipped with broken --ozone-platform-hint flag handling, which we rely on

    ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "124.0.6367.118") [

      # M124 < 124.0.6367.118 shipped with broken --ozone-platform-hint flag handling, which we rely on

      # for our NIXOS_OZONE_WL (wayland) environment variable.

      # See <https://issues.chromium.org/issues/329678163>.

      # This is the commit for the fix that landed in M125, which applies clean on M124.

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

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
        version = "2024-03-14";

      };

    };

    hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA=";

    hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY=";

    version = "124.0.6367.91";

    hash = "sha256-+r/48dxipSAo74v1deMuKalW+Hj85hCun63ZcgLYDLk=";

    hash_deb_amd64 = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY=";

    version = "124.0.6367.118";

  };

  ungoogled-chromium = {

    deps = {