From 95cd49c3b342a6f008976ebc3ec121da241f5631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:59:46 -0400 Subject: [PATCH 1/2] webcord: lock ozone wayland behind NIXOS_OZONE_WL envvar --- .../networking/instant-messengers/webcord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index b410cfdea338..d0cdfd735393 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -62,7 +62,7 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron_27}' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${binPath}" \ - --add-flags "--ozone-platform-hint=auto" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall From cf002f1eb46db5f137d102d83a3a3bb46f31bd7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:40:20 -0400 Subject: [PATCH 2/2] webcord: add self to maintainers --- .../networking/instant-messengers/webcord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index d0cdfd735393..8c292d444206 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -88,7 +88,7 @@ buildNpmPackage rec { changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "webcord"; - maintainers = with lib.maintainers; [ huantian ]; + maintainers = with lib.maintainers; [ eclairevoyant huantian ]; platforms = lib.platforms.linux; }; }