diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2022-04-23 10:31:09 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2022-04-23 10:31:09 +0200 |
| commit | 149fc387d67adac4cf9fd452bfb5186a7f53f16b (patch) | |
| tree | 2370337d43de482a0878874c2919cca711cad86f /pkgs/tools/admin/tigervnc | |
| parent | 4812a3e06052db8aa86370a38b4ce22a92c7630b (diff) | |
| download | nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.tar nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.tar.gz nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.tar.bz2 nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.tar.lz nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.tar.xz nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.tar.zst nixpkgs-149fc387d67adac4cf9fd452bfb5186a7f53f16b.zip | |
tigervnc: fix build with fresh xorgserver via upstream patch
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 1824265b84a..f5cd6f03b96 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk , cmake, gettext, libtool @@ -23,11 +23,22 @@ stdenv.mkDerivation rec { }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/TigerVNC/tigervnc/pull/1383.patch"; + sha256 = "sha256-r3QLtxVD0wIv2NWVN9r0LVxSlLurDHgkAZfkpIjmZyU="; + name = "Xvnc-support-Xorg-1.21-PR1383.patch"; + }) + ]; + postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' + + cp unix/xserver21.1.1.patch unix/xserver211.patch + source_top="$(pwd)" ''; dontUseCmakeBuildDir = true; @@ -46,7 +57,7 @@ stdenv.mkDerivation rec { cp -R xorg*/* unix/xserver pushd unix/xserver version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g') - patch -p1 < ${src}/unix/xserver$version.patch + patch -p1 < "$source_top/unix/xserver$version.patch" autoreconf -vfi ./configure $configureFlags --disable-devel-docs --disable-docs \ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ |