From 61c1de31fbfddefed370a43ae7db78b58813f13c Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 21 Feb 2024 13:14:49 +0300 Subject: [PATCH] freeglut: use libGLX explicitly Required on Darwin. --- pkgs/development/libraries/freeglut/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 69c3b65e4a51..8e79b3e57dea 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake +{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGLX, libGLU, cmake , testers }: @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGL libGLU ]; + buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGLU ]; cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${libGL}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" + "-DOPENGL_INCLUDE_DIR=${libGLX.dev}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${libGLX}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF"