diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-13 17:57:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-13 17:57:13 +0000 |
| commit | 4301f209c96399a6a8eb8cf818dd7f8fed8cdeee (patch) | |
| tree | 963ab6dae558d1ada658a5778b1e0d9aa4e42e2a /pkgs/tools/admin/tigervnc | |
| parent | 97ab4c05b2df1d978ebec84e8fa7d524ab07c3c2 (diff) | |
| download | nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.tar nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.tar.gz nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.tar.bz2 nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.tar.lz nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.tar.xz nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.tar.zst nixpkgs-4301f209c96399a6a8eb8cf818dd7f8fed8cdeee.zip | |
Making the tigervnc server work.
svn path=/nixpkgs/trunk/; revision=22584
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 23f93a1f6b0..e3071c3de4b 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,5 +1,6 @@ {stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver, -autoconf, automake, cvs, libtool, nasm, utilmacros, pixman }: +autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config, +fontDirectories }: with stdenv.lib; @@ -17,8 +18,21 @@ stdenv.mkDerivation { configureFlags = "--enable-nls"; + inherit fontDirectories; + patchPhase = '' sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am + sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${xkbcomp}/bin";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver + + 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 ''; # I don't know why I can't use in the script |