diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-01 17:05:41 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-01 18:57:43 +0200 |
commit | b688074c518a335318c66e5bf5199efc5e3bad34 (patch) | |
tree | 4ef8ae8cdca2a9b15fd69e4397fe442ec433fe4d | |
parent | 8b12eee201df200c2777687fcf1036a4db4e23c5 (diff) |
opensubdiv: Prevent runtime dependency on mesa_noglu.dev
-rw-r--r-- | pkgs/development/libraries/opensubdiv/default.nix | 4 | ||||
-rw-r--r-- | 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 c9bf9a7250308..46a3ba0baa692 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 1fcc08b053db4..7f1c4aebae35b 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; |