diff options
Diffstat (limited to 'pkgs/tools/admin/tigervnc/default.nix')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 20d17b77741..1ef584ec977 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk -, fontDirectories , cmake, gettext, libtool , libGLU , gnutls, pam, nettle , xterm, openssh, perl , makeWrapper +, nixosTests }: with lib; @@ -22,17 +22,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560="; }; - inherit fontDirectories; postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= - for i in $fontDirectories; do - for j in $(find $i -name fonts.dir); do - addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) - done - done - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' ''; @@ -98,6 +91,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; + passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC; + meta = { homepage = "https://tigervnc.org/"; license = lib.licenses.gpl2Plus; |