* libdrm updated to 2.4.15.

* libpthread_stubs updated to 0.3.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18029

2 files changed, 14 insertions, 6 deletions

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 8432c5675f4ce..58f22f7bf69cc 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, pthread_stubs}:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.9";
+  name = "libdrm-2.4.15";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "18i1c4pcy2db2alali1yxg1s72vdpikivahmbrp7wf204kn236zd";
+    sha256 = "1pm7iddv3yjwvqmlbdmj9m55bmkfcfzq0wvqpgx4gkmdjfd8kzxw";
   };
 
   buildInputs = [ pkgconfig pthread_stubs ];
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
+    license = "bsd";
   };
 }
diff --git a/pkgs/development/libraries/pthread-stubs/default.nix b/pkgs/development/libraries/pthread-stubs/default.nix
index 8a007b0f96872..ae4aef74967f3 100644
--- a/pkgs/development/libraries/pthread-stubs/default.nix
+++ b/pkgs/development/libraries/pthread-stubs/default.nix
@@ -1,8 +1,15 @@
-{stdenv, fetchurl}:
-stdenv.mkDerivation {
-  name = "pthread-stubs-0.1";
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libpthread-stubs-0.3";
+  
   src = fetchurl {
-    url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2;
+    url = "http://xcb.freedesktop.org/dist/${name}.tar.bz2";
     sha256 = "0raxl73kmviqinp00bfa025d0j4vmfjjcvfn754mi60mw48swk80";
   };
+
+  meta = {
+    homepage = http://xcb.freedesktop.org/;
+    license = "bsd";
+  };
 }