pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #237722 from hellwolf/insync-wayland-fix

authored by Sandro and committed by GitHub 38616ad5 f6f60c34

+4 -5
unified split
+4 -5
pkgs/applications/networking/insync/default.nix
··· 10 , libdrm 11 , libGL 12 , wayland 13 , libthai 14 }: 15 ··· 88 # for including insync's xdg data dirs 89 extraOutputsToInstall = [ "share" ]; 90 91 - targetPkgs = pkgs: [ 92 insync-pkg 93 - ]; 94 - 95 - multiPkgs = pkgs: with pkgs; [ 96 - # apparently only package needed for the FHS :) 97 libudev0-shim 98 ]; 99 100 runScript = writeShellScript "insync-wrapper.sh" '' 101 # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. 102 export QT_STYLE_OVERRIDE=Fusion 103 exec "${insync-pkg.outPath}/lib/insync/insync" "$@" 104 ''; 105
··· 10 , libdrm 11 , libGL 12 , wayland 13 + , xkeyboard_config 14 , libthai 15 }: 16 ··· 89 # for including insync's xdg data dirs 90 extraOutputsToInstall = [ "share" ]; 91 92 + targetPkgs = pkgs: with pkgs; [ 93 insync-pkg 94 libudev0-shim 95 ]; 96 97 runScript = writeShellScript "insync-wrapper.sh" '' 98 # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. 99 export QT_STYLE_OVERRIDE=Fusion 100 + # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 101 + export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ 102 exec "${insync-pkg.outPath}/lib/insync/insync" "$@" 103 ''; 104