From 0d9236cfcbfc3ed62e7398525a5b3cd27fa421c6 Mon Sep 17 00:00:00 2001 From: Carl Hjerpe Date: Tue, 23 Apr 2024 15:21:30 +0200 Subject: franz+derivatives: Implement NIXOS_OZONE_WL Reverts back to using wrapProgramShell rather than wrapProgramBinary Adds "--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations" when NIXOS_OZONE_WL is set --- pkgs/applications/networking/instant-messengers/franz/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 39c892b335123..533c5c7310b38 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -87,10 +87,11 @@ in stdenv.mkDerivation (rec { dontWrapGApps = true; postFixup = '' - # make xdg-open overrideable at runtime - wrapProgram $out/opt/${name}/${pname} \ + # make xdg-open overridable at runtime + wrapProgramShell $out/opt/${name}/${pname} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --suffix PATH : ${xdg-utils}/bin \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ "''${gappsWrapperArgs[@]}" ''; } // cleanedArgs) -- cgit 1.4.1