diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glfw/3.x.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glfw/3.x.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 3aedaab5658c..15c5e7d9ca58 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -1,25 +1,25 @@ { 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 }: stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.3.8"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-aWwt6FRq/ofQmZAeavDa8inrJfrPxb8iyo1XYdQsrKc="; + sha256 = "sha256-4+H0IXjAwbL5mAWfsIVhW0BSJhcWjkQx4j2TrzZ3aIo="; }; # 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" |