diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-29 07:59:06 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-29 07:59:06 +0000 |
| commit | 41b7a3cda6f43f939920ec26bc0ce3a959125e19 (patch) | |
| tree | 4214ad21c02293eccbd53bf07c722d04f47b26a1 | |
| parent | b1afe4e7ac3ab47d73bc1f748cc406e8e4910ecd (diff) | |
| download | nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.tar nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.tar.gz nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.tar.bz2 nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.tar.lz nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.tar.xz nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.tar.zst nixlib-41b7a3cda6f43f939920ec26bc0ce3a959125e19.zip | |
Making tigervnc build with the xserver 1.8
svn path=/nixpkgs/trunk/; revision=22802
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 134852567a9b..f76b86ffcb2b 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver, autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config, -fontDirectories }: +fontDirectories, fontutil }: with stdenv.lib; @@ -48,7 +48,7 @@ stdenv.mkDerivation { do patch -p1 < $a done - patch -p1 < ../xserver17.patch + patch -p1 < ../xserver18.patch autoreconf -vfi ./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx make TIGERVNC_SRCDIR=`pwd`/../.. @@ -67,7 +67,7 @@ stdenv.mkDerivation { ''; 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6f75018dff4..f4483bff9b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1816,7 +1816,8 @@ let tigervnc = import ../tools/admin/tigervnc { 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 xorg.fontbhlucidatypewriter75dpi ]; }; |