diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-20 19:24:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-20 19:24:21 +0000 |
| commit | 78a5abdf8565773fa3b736dba7731046f3b5e2b0 (patch) | |
| tree | b5c1f42f01c0d2e7ff6a75dfa17a6111db371749 /pkgs/servers/x11/xorg/overrides.nix | |
| parent | 37f66128751b376d2c844a7474dd33334e2ee881 (diff) | |
| download | nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.tar nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.tar.gz nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.tar.bz2 nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.tar.lz nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.tar.xz nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.tar.zst nixlib-78a5abdf8565773fa3b736dba7731046f3b5e2b0.zip | |
* Updated the X.org server to 1.8.2. Note that it no longer depends
on HAL but instead uses udev to autoconfigure input devices. We'll have to update the NixOS X server module accordingly, I guess. See https://fedoraproject.org/wiki/Input_device_configuration. * Updated Mesa to 7.8.2. svn path=/nixpkgs/branches/x-updates/; revision=22681
Diffstat (limited to 'pkgs/servers/x11/xorg/overrides.nix')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1582fc4fdcd4..87d4924a363c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -135,10 +135,12 @@ in xorgserver = attrs: attrs // { patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; buildInputs = attrs.buildInputs ++ - [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto + [ args.zlib args.udev args.mesa + xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto - xorg.libdmx xorg.xf86vidmodeproto xorg.libXext + xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto + xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto + xorg.recordproto xorg.libXext ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; |