Merge pull request #198670 from trofi/dlew-without-xlibsWrapper

glew: use xorg.* packages directly instead of xlibsWrapper indirection
This commit is contained in:
Sergei Trofimovich 2022-11-05 10:17:53 +00:00 committed by GitHub
commit af148bcb89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, xlibsWrapper, libXmu, libXi
{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext
, OpenGL
, enableEGL ? false
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ];
propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
cmakeDir = "cmake";