Merge branch 'master.upstream' into staging.upstream

2015-06-06 12:04:42 -07:00
parent 40b66f6131 ee8825935f
commit 9d6555dc0a
282 changed files with 10933 additions and 4164 deletions
@@ -182,11 +182,11 @@ stdenv.mkDerivation {

  passthru = { inherit libdrm version driverLink; };

-  meta = with stdenv.lib; {
+  meta = {
    description = "An open source implementation of OpenGL";
    homepage = http://www.mesa3d.org/;
    license = "bsd";
-    platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ eduarrrd simons vcunat ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ];
  };
 }