summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorZhaofeng Li <hello@zhaofeng.li>2022-09-11 17:23:57 -0600
committerZhaofeng Li <hello@zhaofeng.li>2022-11-01 08:17:50 -0600
commit13c2eb0eb334b300358aca2b75021e8ad066e992 (patch)
tree95425d95e1fb72f0053887cd52903ebe1928856a /pkgs/tools/X11
parentd40fea9aeb8840fea0d377baa4b38e39b9582458 (diff)
downloadnixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.tar
nixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.tar.gz
nixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.tar.bz2
nixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.tar.lz
nixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.tar.xz
nixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.tar.zst
nixpkgs-13c2eb0eb334b300358aca2b75021e8ad066e992.zip
xpra: Also add module paths to xorg-uinput.conf
If uinput is used, xpra will silently replace "xorg.conf" with
"xorg-uinput.conf" in the xorg/xvfb command line before launching
it [1]. We also need to inject the xorg module paths there.

[1] https://github.com/Xpra-org/xpra/blob/337d861d28af03d112d5bd88817a8293c1e0fce0/xpra/x11/vfb_util.py#L231-L235
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/xpra/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index dd94f5ad46a..20fecbce470 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -189,6 +189,7 @@ in buildPythonApplication rec {
   postInstall = ''
     # append module paths to xorg.conf
     cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
+    cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf
 
     # make application icon visible to desktop environemnts
     icon_dir="$out/share/icons/hicolor/64x64/apps"