nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-27 14:34:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

glfw: use libGL on Darwin

Browse Source 
No need for this conditional any more.
This commit is contained in:
Emily 2024-07-04 15:11:56 +01:00
parent 7086df384e
commit 929a2bf061
2 changed files with 3 additions and 5 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
, Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames
, Carbon, Cocoa, Kernel, fixDarwinDylibNames
, extra-cmake-modules, wayland
, wayland-scanner, wayland-protocols, libxkbcommon
}:
@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
patches = ./x11.patch;
propagatedBuildInputs =
lib.optionals stdenv.isDarwin [ OpenGL ]
++ lib.optionals stdenv.isLinux [ libGL ];
propagatedBuildInputs = [ libGL ];
nativeBuildInputs = [ cmake extra-cmake-modules ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames

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

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