From bfd5f3d9ffca2e02738198e5c24bc49cf3e37c8f Mon Sep 17 00:00:00 2001 From: Ben-Miller0 Date: Sat, 9 Nov 2024 11:37:17 +0000 Subject: [PATCH] glfw3: added vulkan support --- pkgs/by-name/gl/glfw3/package.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix index ba77795b05c8..08a7aef50665 100644 --- a/pkgs/by-name/gl/glfw3/package.nix +++ b/pkgs/by-name/gl/glfw3/package.nix @@ -1,8 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, darwin, fixDarwinDylibNames +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libGL +, vulkan-loader +, libXrandr +, libXinerama +, libXcursor +, libX11 +, libXi +, libXext +, darwin +, fixDarwinDylibNames , wayland -, wayland-scanner, wayland-protocols, libxkbcommon, libdecor +, wayland-scanner +, wayland-protocols +, libxkbcommon +, libdecor , withMinecraftPatch ? false }: let @@ -51,6 +66,7 @@ stdenv.mkDerivation { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" + "-DCMAKE_C_FLAGS=-D_GLFW_VULKAN_LIBRARY='\"${lib.getLib vulkan-loader}/lib/libvulkan.so.1\"'" ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''