Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: add --enable-wayland-ime flag to all Electron packages that uses NIXOS_OZONE_WL #358620

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

34j
Copy link

@34j 34j commented Nov 24, 2024

Closes #358368

Adds --enable-wayland-ime flag to all Electron packages that uses NIXOS_OZONE_WL

According to Fcitx 5 wiki, it seems it is always recommended to add --enable-wayland-ime or --gtk-version=4 (which is only supported in chromium/chrome) flag when launching Electron apps to use text-input-v1. (https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#Chromium_.2F_Electron) See #358368 for further information.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.
import re

from collections import defaultdict
from pathlib import Path

# for each nix file in the pkgs directory
for path in Path('pkgs').rglob('*.nix'):
    txt = path.read_text()
    
    # find NIXOS_OZONE_WL
    # start_text = '''"\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+'''
    match = re.search(r'\${WAYLAND_DISPLAY\:\+(.+?)}}', txt)
    if match:
        if "--enable-wayland-ime" not in match.group(1):
            print(path)
            txt = txt.replace(match.group(1), match.group(1) + " --enable-wayland-ime")
            path.write_text(txt)     

Add a 👍 reaction to pull requests you find important.

@nix-owners nix-owners bot requested a review from emilylange November 24, 2024 04:36
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Nov 24, 2024
@34j 34j changed the title add --enable-wayland-ime flag to all Electron packages that uses NIXOS_OZONE_WL various: add --enable-wayland-ime flag to all Electron packages that uses NIXOS_OZONE_WL Nov 24, 2024
@JohnRTitor JohnRTitor changed the title various: add --enable-wayland-ime flag to all Electron packages that uses NIXOS_OZONE_WL treewide: add --enable-wayland-ime flag to all Electron packages that uses NIXOS_OZONE_WL Nov 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: vscode 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Electron: Inconsistent addition of --enable-wayland-ime when NIXOS_OZONE_WL is set
2 participants