From 1786f6bd4dd9821fad417402f9289021ee0f67ec Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 28 Oct 2015 10:55:38 -0700
Subject: [PATCH] make mesa inputs more specific

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

diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
index 1ada9298f3c..af8b4e1179c 100644
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ b/pkgs/development/libraries/mesa-darwin/default.nix
@@ -2,7 +2,7 @@
 , python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
-, darwin
+, OpenGL, apple_sdk, Xplugin
 }:
 
 let
@@ -23,11 +23,7 @@ let
       presentproto
       libX11 libXext libxcb libXt libxshmfence
       libffi libvdpau
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.OpenGL
-      darwin.apple_sdk.sdk
-      darwin.apple_sdk.libs.Xplugin
-    ];
+    ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ];
 
     postUnpack = ''
       ln -s darwin $sourceRoot/configs/current
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0dd77379fb..2a8d2d5a965 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7623,7 +7623,11 @@ let
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
   mesaDarwinOr = alternative: if stdenv.isDarwin
-    then callPackage ../development/libraries/mesa-darwin { }
+    then callPackage ../development/libraries/mesa-darwin {
+      inherit (darwin.apple_sdk.frameworks) OpenGL;
+      inherit (darwin.apple_sdk.libs) Xplugin;
+      inherit (darwin) apple_sdk;
+    }
     else alternative;
   mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa {
     # makes it slower, but during runtime we link against just mesa_drivers