From f189022d136c31b73d93c6665f22ec3ffb81f6cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Jan 2010 12:43:17 +0000 Subject: [PATCH] * Updated mesa to 7.6.1. * Removed mesa-headers as it's not used anymore. svn path=/nixpkgs/trunk/; revision=19389 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 8 +++++--- pkgs/development/libraries/mesa/headers.nix | 10 ---------- pkgs/top-level/all-packages.nix | 11 +++-------- 4 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/headers.nix diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 53c66ae7c15..9af09c8b333 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ad7ea7ecc5d..558291f5327 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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 diff --git a/pkgs/development/libraries/mesa/headers.nix b/pkgs/development/libraries/mesa/headers.nix deleted file mode 100644 index d90f9be6fd0..00000000000 --- a/pkgs/development/libraries/mesa/headers.nix +++ /dev/null @@ -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/ - "; -} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef6d217bdd3..a3744426741 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;