diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-05 14:18:55 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-06 16:56:52 +0300 |
| commit | 49cacc1dcd63e0621a55a503dca36eef31ee49d9 (patch) | |
| tree | 7dbd5b6105890a2573baf7e0ad2b4a971603b7c9 /pkgs/development/libraries/glfw | |
| parent | ac6d8999f034ca9971e76cf110c3f50046fc0c9a (diff) | |
| download | nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.tar nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.tar.gz nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.tar.bz2 nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.tar.lz nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.tar.xz nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.tar.zst nixpkgs-49cacc1dcd63e0621a55a503dca36eef31ee49d9.zip | |
glfw3: drop libGL on darwin
Diffstat (limited to 'pkgs/development/libraries/glfw')
| -rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 1b97bb108a7..15c5e7d9ca5 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -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" |