public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making tigervnc build with the xserver 1.8

Browse Source 
svn path=/nixpkgs/trunk/; revision=22802
This commit is contained in:
Lluís Batlle i Rossell 2010-07-29 07:59:06 +00:00
parent b1afe4e7ac
commit 41b7a3cda6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/admin/tigervnc/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver, {stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver,
autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config, autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config,
fontDirectories }: fontDirectories, fontutil }:
with stdenv.lib; with stdenv.lib;
@ -48,7 +48,7 @@ stdenv.mkDerivation {
do do
patch -p1 < $a patch -p1 < $a
done done
patch -p1 < ../xserver17.patch patch -p1 < ../xserver18.patch
autoreconf -vfi autoreconf -vfi
./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx ./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx
make TIGERVNC_SRCDIR=`pwd`/../.. make TIGERVNC_SRCDIR=`pwd`/../..
@ -67,7 +67,7 @@ stdenv.mkDerivation {
''; '';
buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs
libtool nasm utilmacros ] ++ xorgserver.buildNativeInputs; libtool nasm utilmacros fontutil ] ++ xorgserver.buildNativeInputs;
propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs; propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs;

3
pkgs/top-level/all-packages.nix
View File

@ -1816,7 +1816,8 @@ let
tigervnc = import ../tools/admin/tigervnc { tigervnc = import ../tools/admin/tigervnc {
inherit fetchsvn stdenv gettext autoconf automake cvs libtool nasm xkeyboard_config; inherit fetchsvn stdenv gettext autoconf automake cvs libtool nasm xkeyboard_config;
inherit (xorg) libX11 libXext libICE libXtst libXi libSM xorgserver utilmacros pixman xkbcomp; inherit (xorg) libX11 libXext libICE libXtst libXi libSM xorgserver utilmacros pixman xkbcomp
fontutil;
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
xorg.fontbhlucidatypewriter75dpi ]; xorg.fontbhlucidatypewriter75dpi ];
}; };