mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
opensubdiv: Prevent runtime dependency on mesa_noglu.dev
This commit is contained in:
parent
8b12eee201
commit
b688074c51
@ -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
|
||||
]
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user