From 7b4a3549ec7c6abd1561e27a2be4d0c7a10ae853 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 14 Apr 2023 11:20:15 +0900 Subject: [PATCH] joplin-desktop: Add support for `NIXOS_OZONE_WL` --- pkgs/applications/misc/joplin-desktop/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 68e03b8902de..9d621ee54177 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: +{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }: let pname = "joplin-desktop"; @@ -51,6 +51,9 @@ let extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' mv $out/bin/{${name},${pname}} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \