From 8ecdb2048d182b3bca8ec07e11ddf5339ba58c1e Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Wed, 14 Jun 2023 10:31:22 +0300 Subject: [PATCH] insync: fix launching issue on wayland --- pkgs/applications/networking/insync/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 968770ecd0be..282d45513ced 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -10,6 +10,7 @@ , libdrm , libGL , wayland +, xkeyboard_config , libthai }: @@ -88,18 +89,16 @@ let # for including insync's xdg data dirs extraOutputsToInstall = [ "share" ]; - targetPkgs = pkgs: [ + targetPkgs = pkgs: with pkgs; [ insync-pkg - ]; - - multiPkgs = pkgs: with pkgs; [ - # apparently only package needed for the FHS :) libudev0-shim ]; runScript = writeShellScript "insync-wrapper.sh" '' # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. export QT_STYLE_OVERRIDE=Fusion + # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 + export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ exec "${insync-pkg.outPath}/lib/insync/insync" "$@" '';