diff options
| author | ahiaao <ahiaao@waifu.club> | 2020-01-31 22:34:41 -0800 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-02-11 09:46:24 +0100 |
| commit | f216b03d5b01490aadc54e5e9d5e3cb607816262 (patch) | |
| tree | 96e263a273f3b9eb429aebcfb2367c62aaee732a /pkgs/tools/admin | |
| parent | ef399ee03542dcc45c9f3572eb75d4a36abd589b (diff) | |
| download | nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.tar nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.tar.gz nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.tar.bz2 nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.tar.lz nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.tar.xz nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.tar.zst nixlib-f216b03d5b01490aadc54e5e9d5e3cb607816262.zip | |
tigervnc: fix compatibility with xorgserver 1.20.7
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 1c2243d04f11..9f105a7d5d55 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { inherit fontDirectories; + patches = [ ./u_xorg-server-1.20.7-ddxInputThreadInit.patch ]; + postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= diff --git a/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch b/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch new file mode 100644 index 000000000000..c18f4bf213f2 --- /dev/null +++ b/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch @@ -0,0 +1,21 @@ +Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch +diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c +--- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:19:19.486731848 +0000 ++++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:37:33.275445409 +0000 +@@ -295,6 +295,15 @@ void ddxBeforeReset(void) + } + #endif + ++#if INPUTTHREAD ++/** This function is called in Xserver/os/inputthread.c when starting ++ the input thread. */ ++void ++ddxInputThreadInit(void) ++{ ++} ++#endif ++ + void ddxUseMsg(void) + { + vncPrintBanner(); + |