glew{,110}: don't depend on mesa on darwin
This commit is contained in:
parent
823bc77463
commit
5ba4eb2d2e
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
|
||||
, AGL ? null
|
||||
, AGL, OpenGL
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
|
||||
};
|
||||
|
||||
buildInputs = [ xlibsWrapper libXmu libXi ]
|
||||
++ optionals stdenv.isDarwin [ AGL ];
|
||||
propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
|
||||
buildInputs = if stdenv.isDarwin then [ AGL ] else [ xlibsWrapper libXmu libXi ];
|
||||
propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|lib64|lib|' config/Makefile.linux
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
|
||||
, OpenGL
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -13,8 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
buildInputs = [ xlibsWrapper libXmu libXi ];
|
||||
propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
|
||||
buildInputs = optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ];
|
||||
propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|lib64|lib|' config/Makefile.linux
|
||||
|
@ -13060,9 +13060,11 @@ in
|
||||
|
||||
gle = callPackage ../development/libraries/gle { };
|
||||
|
||||
glew = callPackage ../development/libraries/glew { };
|
||||
glew = callPackage ../development/libraries/glew {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL;
|
||||
};
|
||||
glew110 = callPackage ../development/libraries/glew/1.10.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AGL;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL OpenGL;
|
||||
};
|
||||
|
||||
glfw = glfw3;
|
||||
|
Loading…
Reference in New Issue
Block a user