Merge pull request #111689 from Luflosi/glfw-dont-substitute
glfw: hardwire path to libGL.so.1 the intended way
This commit is contained in:
commit
2fd4001228
1 changed files with 5 additions and 5 deletions
|
@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ];
|
||||
|
||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
|
||||
|
||||
preConfigure = lib.optional (!stdenv.isDarwin) ''
|
||||
substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1"
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
] ++ lib.optional (!stdenv.isDarwin) [
|
||||
"-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
|
||||
|
|
Loading…
Reference in a new issue