Unverified Commit 09f5b769 authored by Someone's avatar Someone Committed by GitHub
Browse files

imgui: add pkgsCross.mingwW64 support (#342271)

parents e9e4fb40 6078e0e1

pkgs/by-name/gl/glfw3/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ]

pkgs/development/libraries/imgui/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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 [