b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Updated the X.org server to 1.8.2. Note that it no longer depends

Browse source 
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
This commit is contained in:
Eelco Dolstra 2010-07-20 19:24:21 +00:00
parent 37f6612875
commit 78a5abdf85
7 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/mesa/default.nix
View file

@ -5,15 +5,16 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
else
stdenv.mkDerivation {
name = "mesa-7.6.1";
name = "mesa-7.8.2";
src = fetchurl {
url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2;
md5 = "7db4617e9e10ad3aca1b64339fd71b7d";
url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2;
md5 = "6be2d343a0089bfd395ce02aaf8adb57";
};
configureFlags = "--disable-gallium"
+ (if stdenv.isDarwin then " --disable-egl" else "");
configureFlags =
"--disable-gallium"
+ (if stdenv.isDarwin then " --disable-egl" else "");
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto

10
pkgs/servers/x11/xorg/default.nix
View file

@ -2018,14 +2018,14 @@ let
})) // {inherit ;};
xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
name = "xorg-server-1.7.7";
name = "xorg-server-1.8.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.7.7.tar.bz2;
sha256 = "1zr63701gii6aarxj9016gdymhiv3ycfdnixxbdjm1dqzqmx7i2l";
url = mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2;
sha256 = "1qmcmrv26p8645nwdm2q558mpvi75fpn9knkacanzysw5497w5aj";
};
buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
})) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
})) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
name = "xorg-sgml-doctools-1.3";

2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View file

@ -21,7 +21,7 @@ my %pcMap;
my %extraAttrs;
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "hal", "openssl", "gperf", "m4");
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
$pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng";

8
pkgs/servers/x11/xorg/overrides.nix
View file

@ -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 ];

2
pkgs/servers/x11/xorg/tarballs-7.5.list
View file

@ -179,7 +179,7 @@ mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.7.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2

6
pkgs/tools/graphics/glxinfo/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, x11, mesa}:
stdenv.mkDerivation {
name = "glxinfo-7.4.1";
name = "glxinfo-7.8.2";
src = fetchurl {
url = mirror://sourceforge/mesa3d/MesaDemos-7.4.1.tar.bz2;
md5 = "1e169fb6abc2b45613f1c98a82dfe690";
url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaDemos-7.8.2.tar.bz2;
md5 = "757d9e2e06f48b1a52848be9b0307ced";
};
buildInputs = [x11 mesa];

2
pkgs/top-level/all-packages.nix
View file

@ -6128,7 +6128,7 @@ let
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus hal libuuid openssl gperf m4
automake autoconf libtool xmlto asciidoc;
automake autoconf libtool xmlto asciidoc udev;
# !!! pythonBase is use instead of python because this cause an infinite
# !!! recursion when the flag python.full is set to true. Packages