tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #236055 from wegank/glfw3-libgl

glfw3: drop libGL on darwin

authored by

Weijia Wang and committed by
GitHub 41b37eb5 17d63282

+4 -4
unified split
+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
··· 20731 20731 }; 20732 20732 glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; 20733 20733 glfw3 = callPackage ../development/libraries/glfw/3.x.nix { 20734 - inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; 20734 + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; 20735 20735 }; 20736 20736 20737 20737 glibc = callPackage ../development/libraries/glibc {