mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
insync: fix launching issue on wayland
This commit is contained in:
parent
fe2991bd88
commit
8ecdb2048d
|
@ -10,6 +10,7 @@
|
||||||
, libdrm
|
, libdrm
|
||||||
, libGL
|
, libGL
|
||||||
, wayland
|
, wayland
|
||||||
|
, xkeyboard_config
|
||||||
, libthai
|
, libthai
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -88,18 +89,16 @@ let
|
||||||
# for including insync's xdg data dirs
|
# for including insync's xdg data dirs
|
||||||
extraOutputsToInstall = [ "share" ];
|
extraOutputsToInstall = [ "share" ];
|
||||||
|
|
||||||
targetPkgs = pkgs: [
|
targetPkgs = pkgs: with pkgs; [
|
||||||
insync-pkg
|
insync-pkg
|
||||||
];
|
|
||||||
|
|
||||||
multiPkgs = pkgs: with pkgs; [
|
|
||||||
# apparently only package needed for the FHS :)
|
|
||||||
libudev0-shim
|
libudev0-shim
|
||||||
];
|
];
|
||||||
|
|
||||||
runScript = writeShellScript "insync-wrapper.sh" ''
|
runScript = writeShellScript "insync-wrapper.sh" ''
|
||||||
# QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary.
|
# QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary.
|
||||||
export QT_STYLE_OVERRIDE=Fusion
|
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" "$@"
|
exec "${insync-pkg.outPath}/lib/insync/insync" "$@"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue