From 7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 14 Jun 2013 07:46:33 +0400
Subject: [PATCH] Some fixes

---
 pkgs/development/libraries/mesa/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1fca905cf55b..6cfb4314e0aa 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -81,12 +81,14 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
 
-  propagatedBuildInputs = with xorg; [ libdrm libXdamage libXxf86vm ];
+  propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ];
   buildInputs = with xorg; [
-    autoconf automake libtool intltool expat libxml2Python udev llvm
+    autoconf automake libtool intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
     libffi wayland
-  ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ];
+  ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
+  ++ stdenv.lib.optional stdenv.isLinux [libdrm udev]
+  ;
 
   enableParallelBuilding = true;
   doCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 973378f0e503..26b7d474275c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4091,6 +4091,7 @@ let
 
   cairo = callPackage ../development/libraries/cairo {
     pixman = pixman_cairo; # it's recommended to be in sync
+    glSupport = lib.elem system lib.platforms.mesaPlatforms;
   };
   pixman_cairo = callPackage ../development/libraries/pixman { };
   cairomm = callPackage ../development/libraries/cairomm { };