ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-25 22:57:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #236055 from wegank/glfw3-libgl

Browse Source 
glfw3: drop libGL on darwin
This commit is contained in:
Weijia Wang 2023-06-08 21:43:47 +03:00 committed by GitHub
commit 41b37eb58f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { stdenv, lib, fetchFromGitHub, cmake
, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
, Cocoa, Kernel, fixDarwinDylibNames , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames
, waylandSupport ? false, extra-cmake-modules, wayland , waylandSupport ? false, extra-cmake-modules, wayland
, wayland-protocols, libxkbcommon , wayland-protocols, libxkbcommon
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
patches = lib.optional (!waylandSupport) ./x11.patch; patches = lib.optional (!waylandSupport) ./x11.patch;
propagatedBuildInputs = [ libGL ]; propagatedBuildInputs = [ (if stdenv.isDarwin then OpenGL else libGL) ];
nativeBuildInputs = [ cmake ] nativeBuildInputs = [ cmake ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames ++ lib.optional stdenv.isDarwin fixDarwinDylibNames
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
if waylandSupport if waylandSupport
then [ wayland wayland-protocols libxkbcommon ] then [ wayland wayland-protocols libxkbcommon ]
else [ libX11 libXrandr libXinerama libXcursor libXi libXext ] else [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"

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

@ -20731,7 +20731,7 @@ with pkgs;
}; };
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
glfw3 = callPackage ../development/libraries/glfw/3.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 { glibc = callPackage ../development/libraries/glibc {