swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

opensubdiv: Prevent runtime dependency on mesa_noglu.dev

Browse source
This commit is contained in:
Eelco Dolstra 2016-09-01 17:05:41 +02:00
parent 8b12eee201
commit b688074c51
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/opensubdiv/default.nix
View file

@ -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
]

3
pkgs/top-level/all-packages.nix
View file

@ -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;