From fc7e46afbcd640a8ec9300fea2b32a4ebf68ba2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 20 Dec 2022 09:31:21 +0100 Subject: [PATCH] electron: add missing wayland runtimeDependency when using --ozone-platform-hint=wayland it will dlopen this library. Adding wayland to rpath does not increase the closure size since gtk3 already should have wayland in its closure. This fixes element-desktop for example. (cherry picked from commit 3905ea888e9cc5f74c5f138709970d33ab4fe213) --- pkgs/development/tools/electron/default.nix | 1 + pkgs/development/tools/electron/generic.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c197aa8b9ec5..5c0838fce73f 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -16,6 +16,7 @@ , libappindicator-gtk3 , libxshmfence , libglvnd +, wayland }@args: let diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 8c64b86b43a1..76f2bc427590 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -16,6 +16,7 @@ , libappindicator-gtk3 , libxshmfence , libglvnd +, wayland }: version: hashes: @@ -64,7 +65,7 @@ let }; electronLibPath = with lib; makeLibraryPath ( - [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] + [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ] ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]