pyrox.dev
lol
glfw3: drop libGL on darwin
+3
-3
pkgs/development/libraries/glfw/3.x.nix
+3
-3
pkgs/development/libraries/glfw/3.x.nix
···
1
1
{ stdenv, lib, fetchFromGitHub, cmake
2
2
, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
3
-
, Cocoa, Kernel, fixDarwinDylibNames
3
+
, Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames
4
4
, waylandSupport ? false, extra-cmake-modules, wayland
5
5
, wayland-protocols, libxkbcommon
6
6
}:
···
19
19
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
20
20
patches = lib.optional (!waylandSupport) ./x11.patch;
21
21
22
-
propagatedBuildInputs = [ libGL ];
22
+
propagatedBuildInputs = [ (if stdenv.isDarwin then OpenGL else libGL) ];
23
23
24
24
nativeBuildInputs = [ cmake ]
25
25
++ lib.optional stdenv.isDarwin fixDarwinDylibNames
···
29
29
if waylandSupport
30
30
then [ wayland wayland-protocols libxkbcommon ]
31
31
else [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
32
-
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ];
32
+
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ];
33
33
34
34
cmakeFlags = [
35
35
"-DBUILD_SHARED_LIBS=ON"
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
20737
20737
};
20738
20738
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
20739
20739
glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
20740
-
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
20740
+
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL;
20741
20741
};
20742
20742
20743
20743
glibc = callPackage ../development/libraries/glibc {