diff --git a/pkgs/development/libraries/libdrm/2.4.39.nix b/pkgs/development/libraries/libdrm/2.4.40.nix similarity index 91% rename from pkgs/development/libraries/libdrm/2.4.39.nix rename to pkgs/development/libraries/libdrm/2.4.40.nix index 4d05c25955d..b36fcd60202 100644 --- a/pkgs/development/libraries/libdrm/2.4.39.nix +++ b/pkgs/development/libraries/libdrm/2.4.40.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.39"; + name = "libdrm-2.4.40"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0gbk598li3nlyjvyqilg931i4yy7skp1rs7d2v54nl40i4w1fsrq"; + sha256 = "07xazz6flzc2khvks2cxls36sbsx0ns3x2cj499dw3za0134xha8"; }; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mesa/9.0.x.nix b/pkgs/development/libraries/mesa/9.0.x.nix index 97874a258f5..4b549b6a5a9 100644 --- a/pkgs/development/libraries/mesa/9.0.x.nix +++ b/pkgs/development/libraries/mesa/9.0.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, autoreconfHook, libtool -, flex, bison, pkgconfig, libdrm2_4_39, file, expat, makedepend, llvm +, flex, bison, pkgconfig, libdrm2_4_40, file, expat, makedepend, llvm , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext , libXt, udev, enableTextureFloats ? false , python, libxml2Python, wayland }: @@ -8,14 +8,14 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else -let version = "9.0.1"; in +let version = "9.0.2"; in stdenv.mkDerivation { name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - md5 = "97d6554c05ea7449398afe3a0ede7018"; + md5 = "dc45d1192203e418163e0017640e1cfc"; }; patches = @@ -31,14 +31,14 @@ stdenv.mkDerivation { + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; buildInputs = [ autoconf automake autoreconfHook libtool - expat libdrm2_4_39 libXxf86vm libXfixes libXdamage glproto dri2proto llvm + expat libdrm2_4_40 libXxf86vm libXfixes libXdamage glproto dri2proto llvm libxml2Python libX11 libXext libxcb libXt udev wayland ]; buildNativeInputs = [ pkgconfig python makedepend file flex bison ]; enableParallelBuilding = true; - passthru = { inherit libdrm2_4_39; }; + passthru = { inherit libdrm2_4_40; }; meta = { description = "An open source implementation of OpenGL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4da6b55e00..2b3da9ea1ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4178,7 +4178,7 @@ let inherit (xorg) libpthreadstubs; }; - libdrm2_4_39 = callPackage ../development/libraries/libdrm/2.4.39.nix { + libdrm2_4_40 = callPackage ../development/libraries/libdrm/2.4.40.nix { inherit fetchurl stdenv pkgconfig; inherit (xorg) libpthreadstubs; };