diff options
author | Linus Heckemann <git@sphalerite.org> | 2021-07-20 15:21:49 +0200 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2021-07-20 15:23:06 +0200 |
commit | cfb935c54940115751270011a569ba3214984f5a (patch) | |
tree | a1be63b0d092395bf7cbd8d5c129b0f14e7d65ec /pkgs/tools/admin/tigervnc | |
parent | 5143ab9f742d27086790e07ebf35f36cb6b26ade (diff) |
tigervnc: remove fontDirectories
These aren't necessary for tigervnc to function, and introduce an unfree dependency, so let's remove them.
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 01579b059b08d..1ef584ec977f9 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk -, fontDirectories , cmake, gettext, libtool , libGLU , gnutls, pam, nettle @@ -23,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' ''; |