From 0bb8593bbb7c8eb5d7525f3916c39c6b126a0152 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Jan 2006 12:42:57 +0000 Subject: [PATCH] * libdrm updated to 2.0. svn path=/nixpkgs/trunk/; revision=4569 --- pkgs/development/libraries/libdrm/default.nix | 6 +++--- pkgs/development/libraries/mesa/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 78ca77eb6bf..532990ba6f6 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libdrm-1.0.5"; + name = "libdrm-2.0"; src = fetchurl { - url = http://dri.freedesktop.org/libdrm/libdrm-1.0.5.tar.gz; - md5 = "e31257237969d5fc2c9e9eb4ad8110cf"; + url = http://dri.freedesktop.org/libdrm/libdrm-2.0.tar.gz; + md5 = "9d1aab104eb757ceeb2c1a6d38d57411"; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ed4c2ab56e9..f9e501ea5a9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs}: +{stdenv, fetchurl, x11, libXmu, libXi}: assert stdenv.system == "i686-linux"; @@ -19,5 +19,5 @@ stdenv.mkDerivation { }) */ ]; builder = ./builder.sh; - buildInputs = [xlibs.xlibs xlibs.libXmu xlibs.libXi]; + buildInputs = [x11 libXmu libXi]; }