From b688074c518a335318c66e5bf5199efc5e3bad34 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Sep 2016 17:05:41 +0200
Subject: [PATCH] opensubdiv: Prevent runtime dependency on mesa_noglu.dev

---
 pkgs/development/libraries/opensubdiv/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index c9bf9a725030..46a3ba0baa69 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa, glew
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu, mesa_noglu, glew
 , cudaSupport ? false, cudatoolkit
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     ];
 
   buildInputs =
-    [ cmake pkgconfig mesa
+    [ cmake pkgconfig mesa_glu mesa_noglu
       # FIXME: these are not actually needed, but the configure script wants them.
       glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama
     ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fcc08b053db..7f1c4aebae35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8767,8 +8767,11 @@ in
     };
     in mo.drivers
   );
+
   mesa = mesaDarwinOr (buildEnv {
     name = "mesa-${mesa_noglu.version}";
+    # FIXME: this causes mesa to have a runtime dependency on
+    # mesa_noglu.dev.
     paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ];
     meta = {
       platforms = lib.platforms.unix;