BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glfw3: drop libGL on darwin

Browse source
This commit is contained in:
Weijia Wang 2023-06-05 14:18:55 +03:00
parent ac6d8999f0
commit 49cacc1dcd
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/glfw/3.x.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake
, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
, Cocoa, Kernel, fixDarwinDylibNames
, Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames
, waylandSupport ? false, extra-cmake-modules, wayland
, wayland-protocols, libxkbcommon
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
patches = lib.optional (!waylandSupport) ./x11.patch;
propagatedBuildInputs = [ libGL ];
propagatedBuildInputs = [ (if stdenv.isDarwin then OpenGL else libGL) ];
nativeBuildInputs = [ cmake ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
if waylandSupport
then [ wayland wayland-protocols libxkbcommon ]
else [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ];
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"

2
pkgs/top-level/all-packages.nix
View file

@ -20737,7 +20737,7 @@ with pkgs;
};
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL;
};
glibc = callPackage ../development/libraries/glibc {