Author: viric
Date: Tue Jul 13 17:57:13 2010
New Revision: 22584
URL: https://svn.nixos.org/websvn/nix/?rev=22584&sc=1
Log:
Making the tigervnc server work.
Modified:
nixpkgs/trunk/pkgs/tools/admin/tigervnc/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/admin/tigervnc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/admin/tigervnc/default.nix Tue Jul 13 16:32:26
2010 (r22583)
+++ nixpkgs/trunk/pkgs/tools/admin/tigervnc/default.nix Tue Jul 13 17:57:13
2010 (r22584)
@@ -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 @@
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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 13 16:32:26
2010 (r22583)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 13 17:57:13
2010 (r22584)
@@ -1821,8 +1821,10 @@
};
tigervnc = import ../tools/admin/tigervnc {
- inherit fetchsvn stdenv gettext autoconf automake cvs libtool nasm;
- inherit (xorg) libX11 libXext libICE libXtst libXi libSM xorgserver
utilmacros pixman;
+ inherit fetchsvn stdenv gettext autoconf automake cvs libtool nasm
xkeyboard_config;
+ inherit (xorg) libX11 libXext libICE libXtst libXi libSM xorgserver
utilmacros pixman xkbcomp;
+ fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc
xorg.fontcursormisc
+ xorg.fontbhlucidatypewriter75dpi ];
};
tightvnc = import ../tools/admin/tightvnc {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
