From 5dbf1419fecf2bf7858fdce662641ec3b0134e3d Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Tue, 23 Apr 2024 17:11:52 +0200
Subject: [PATCH 1/2] vesktop: wayland IME option

This commit adds an option to wrap the resulting program with the
`--enable-wayland-ime` argument, so that IME support on wayland can be
enabled in the package.
---
 pkgs/by-name/ve/vesktop/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 980258ed863a..b35f53579b45 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -17,6 +17,7 @@
   # Enables the use of vencord from nixpkgs instead of
   # letting vesktop manage it's own version
 , withSystemVencord ? true
+, withWaylandIME ? false
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
@@ -128,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
       makeWrapper ${electron}/bin/electron $out/bin/vesktop \
         --add-flags $out/opt/Vesktop/resources/app.asar \
         ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
+        ${lib.optionalString withWaylandIME "--add-flags \"--enable-wayland-ime\""} \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
 
       runHook postInstall

From 3d2f4980b76a03ad9086a366c262db0ffb3debe6 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Wed, 24 Apr 2024 15:17:34 +0200
Subject: [PATCH 2/2] vesktop: IME with NIXOS_OZONE_WL

This moves the `--enable-wayland-ime` flag to NIXOS_OZONE_WL instead of
having a separate option for it.
---
 pkgs/by-name/ve/vesktop/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index b35f53579b45..d3952f621a12 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -17,7 +17,6 @@
   # Enables the use of vencord from nixpkgs instead of
   # letting vesktop manage it's own version
 , withSystemVencord ? true
-, withWaylandIME ? false
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
@@ -129,8 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
       makeWrapper ${electron}/bin/electron $out/bin/vesktop \
         --add-flags $out/opt/Vesktop/resources/app.asar \
         ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
-        ${lib.optionalString withWaylandIME "--add-flags \"--enable-wayland-ime\""} \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
 
       runHook postInstall
     '';