swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Updated mesa to 7.6.1.

Browse source 
* Removed mesa-headers as it's not used anymore.

svn path=/nixpkgs/trunk/; revision=19389
This commit is contained in:
Eelco Dolstra 2010-01-13 12:43:17 +00:00
parent 35257ada4e
commit f189022d13
4 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libdrm/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
stdenv.mkDerivation rec {
name = "libdrm-2.4.15";
name = "libdrm-2.4.17";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "1pm7iddv3yjwvqmlbdmj9m55bmkfcfzq0wvqpgx4gkmdjfd8kzxw";
sha256 = "0sii8bhplb99i4x67626sd4pm1c2i3i0c73rdma71sdh233fg95q";
};
buildInputs = [ pkgconfig libpthreadstubs ];

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

@ -5,12 +5,14 @@ if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.sy
else
stdenv.mkDerivation {
name = "mesa-7.5.2";
name = "mesa-7.6.1";
src = fetchurl {
url = ftp://ftp.freedesktop.org/pub/mesa/7.5.2/MesaLib-7.5.2.tar.bz2;
md5 = "94e47a499f1226803869c2e37a6a8e3a";
url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2;
md5 = "7db4617e9e10ad3aca1b64339fd71b7d";
};
configureFlags = "--disable-gallium";
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto

10
pkgs/development/libraries/mesa/headers.nix
View file

@ -1,10 +0,0 @@
{stdenv, mesaSrc}:
stdenv.mkDerivation {
name = "mesa-headers-6.5.2"; # !!! keep up-to-date
buildCommand = "
unpackFile ${mesaSrc}
ensureDir $out/include
cp -prvd Mesa-*/include/GL $out/include/
";
}

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

@ -3336,14 +3336,14 @@ let
fltk11 = (import ../development/libraries/fltk/fltk11.nix) {
inherit composableDerivation x11 lib pkgconfig freeglut;
inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ;
inherit fetchurl stdenv mesa libpng libjpeg zlib ;
inherit (xlibs) inputproto libXi libXinerama libXft;
flags = [ "useNixLibs" "threads" "shared" "gl" ];
};
fltk20 = (import ../development/libraries/fltk) {
inherit composableDerivation x11 lib pkgconfig freeglut;
inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ;
inherit fetchurl stdenv mesa libpng libjpeg zlib ;
inherit (xlibs) inputproto libXi libXinerama libXft;
flags = [ "useNixLibs" "threads" "shared" "gl" ];
};
@ -4258,11 +4258,6 @@ let
inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm;
};
mesaHeaders = import ../development/libraries/mesa/headers.nix {
inherit stdenv;
mesaSrc = mesa.src;
};
ming = import ../development/libraries/ming {
inherit fetchurl stdenv flex bison freetype zlib libpng perl;
};
@ -5263,7 +5258,7 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa mesaHeaders
libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus hal libuuid openssl gperf m4
automake autoconf libtool;