Unverified Commit fb10ea41 authored by emilylange's avatar emilylange
Browse files

chromium: fix `--ozone-platform-hint` flag on wayland

M124 shipped with broken `--ozone-platform-hint` flag handling, which we
rely on NIXOS_OZONE_WL (wayland) environment variable.

This resulted in chromium M124 opening as blank/transparent window under
wayland.

X11 continued to work fine, which is why our X11-only chromium VM test
did not catch this.

See https://issues.chromium.org/issues/329678163 for details.

Fortunately, the fix for that which landed in M125, applies cleanly on
M124, so we do just that and essentially backport that fix to M124.
parent d93b17c0
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -248,6 +248,15 @@ 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
      # 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.
      (githubPatch {
        commit = "c7f4c58f896a651eba80ad805ebdb49d19ebdbd4";
        hash = "sha256-6nYWT2zN+j73xAIXLdGYT2eC71vGnGfiLCB0OwT0CAI=";
      })
    ];

    postPatch = ''