From 3f2c3a60668a1ab797df44438886ae993b09da70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Nov 2005 21:49:08 +0000 Subject: [PATCH] * More fixes to get a basic X server running (keyboard, mouse, i810 graphics). svn path=/nixpkgs/trunk/; revision=4198 --- pkgs/servers/x11/xorg/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 23d9c1071d6..0643a1fdb12 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -300,7 +300,8 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-video-i810-1.4.0.1.tar.bz2; md5 = "9672a46773966c72d2d46e515c0324be"; }; - buildInputs = [pkgconfig xorgserver xproto libXvMC libdrm xf86driproto ]; + buildInputs = [pkgconfig xorgserver xproto libXvMC libdrm xf86driproto randrproto renderproto mesa glproto fontsproto ]; + # !!! possible "randrproto renderproto" should be propagated by xorg-server }; libXtst = stdenv.mkDerivation { @@ -435,7 +436,7 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-input-mouse-1.0.0.1.tar.bz2; md5 = "43712cd2961c22103827af04a228b4ff"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + buildInputs = [pkgconfig xorgserver xproto randrproto inputproto ]; }; trapproto = stdenv.mkDerivation { @@ -768,7 +769,8 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-input-keyboard-1.0.0.1.tar.bz2; md5 = "6d85c8ef6dd037f8824f0fe339383913"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + buildInputs = [pkgconfig xorgserver xproto randrproto inputproto kbproto ]; + # real bug: inputproto kbproto }; xclipboard = stdenv.mkDerivation {