ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-11 15:08:52 +03:00
Code Issues Projects Releases Wiki Activity

imgui: add pkgsCross.mingwW64 support (#342271)

Browse Source
This commit is contained in:
Someone 2024-09-17 08:22:53 +00:00 committed by GitHub
commit 09f5b769ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/by-name/gl/glfw3/package.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
];
propagatedBuildInputs = [ libGL ];
propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ];
nativeBuildInputs = [ cmake extra-cmake-modules ]
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]

5
pkgs/development/libraries/imgui/default.nix
View File

@ -14,6 +14,9 @@
vulkan-headers,
vulkan-loader,
# NOTE: Not coming from vcpkg
IMGUI_LINK_GLVND ? !stdenv.hostPlatform.isWindows && (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING),
# The intent is to mirror vcpkg's flags[^1],
# but we only actually support Linux and glfw3 until someone contributes the rest
# [^1]: https://github.com/microsoft/vcpkg/blob/095ee06e7f60dceef7d713e3f8b1c2eb10d650d7/ports/imgui/CMakeLists.txt#L33-L108
@ -84,7 +87,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs =
lib.optionals (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING) [ libGL ]
lib.optionals IMGUI_LINK_GLVND [ libGL ]
++ lib.optionals IMGUI_BUILD_GLFW_BINDING [ glfw ]
++ lib.optionals IMGUI_BUILD_SDL2_BINDING [ SDL2 ]
++ lib.optionals IMGUI_BUILD_VULKAN_BINDING [