ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:21:57 +03:00
Code Issues Projects Releases Wiki Activity

* More fixes to get a basic X server running (keyboard, mouse, i810

Browse Source 
graphics).

svn path=/nixpkgs/trunk/; revision=4198
This commit is contained in:
Eelco Dolstra 2005-11-02 21:49:08 +00:00
parent a21e96548a
commit 3f2c3a6066
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/x11/xorg/default.nix
View File

@ -300,7 +300,8 @@ rec {
url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-video-i810-1.4.0.1.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-video-i810-1.4.0.1.tar.bz2;
md5 = "9672a46773966c72d2d46e515c0324be"; 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 { 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; url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-input-mouse-1.0.0.1.tar.bz2;
md5 = "43712cd2961c22103827af04a228b4ff"; md5 = "43712cd2961c22103827af04a228b4ff";
}; };
buildInputs = [pkgconfig xorgserver xproto ]; buildInputs = [pkgconfig xorgserver xproto randrproto inputproto ];
}; };
trapproto = stdenv.mkDerivation { 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; url = http://nix.cs.uu.nl/dist/tarballs/xorg/xf86-input-keyboard-1.0.0.1.tar.bz2;
md5 = "6d85c8ef6dd037f8824f0fe339383913"; md5 = "6d85c8ef6dd037f8824f0fe339383913";
}; };
buildInputs = [pkgconfig xorgserver xproto ]; buildInputs = [pkgconfig xorgserver xproto randrproto inputproto kbproto ];
# real bug: inputproto kbproto
}; };
xclipboard = stdenv.mkDerivation { xclipboard = stdenv.mkDerivation {