diff options
| author | Emily <git@emilylange.de> | 2024-05-02 15:51:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 15:51:52 +0200 |
| commit | 8636bdfa2f91bcb7be71744484a8b75d985aa92a (patch) | |
| tree | 7b831a66a0cbf976ac1dbc2ac3bca2cfd252a408 | |
| parent | 2e5289eb9260a2719c810d56a17d58ad93ce5e7e (diff) | |
| parent | 177ce9ca10c3620829fed67f8360aeebf02f110a (diff) | |
Merge pull request #308401 from NixOS/backport-308358-to-release-23.11
[Backport release-23.11] chromium: 124.0.6367.91 -> 124.0.6367.118, lower version range of `--ozone-platform-hint` patch
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ad2e1620e70d..b93163e0fc9c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c3ef4848ee44..345370868d71 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -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 = { |