From d2ed23e623506b54ba8443e19d6b5cbb7e5069aa Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 24 Feb 2025 17:18:49 +0100 Subject: [PATCH] trezor-suite: enable wayland --- pkgs/by-name/tr/trezor-suite/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index c40e1ec54a5a..5cc2d64203d6 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, appimageTools, + makeWrapper, tor, trezord, }: @@ -29,7 +30,7 @@ let .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; @@ -38,6 +39,8 @@ in appimageTools.wrapType2 rec { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources @@ -45,6 +48,9 @@ appimageTools.wrapType2 rec { cp -a ${appimageContents}/resources/app*.* $out/share/${pname}/resources cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources + wrapProgram $out/bin/trezor-suite \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/resources/images/desktop/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \