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

Merge pull request #315917 from wegank/imgui-darwin

imgui: fix build on darwin
parents 4c9c9a80 d9ebd6bc
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.ApplicationServices
    darwin.apple_sdk.frameworks.Cocoa
    darwin.apple_sdk.frameworks.GameController
  ];

  propagatedBuildInputs =
+2 −5
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;

  postPatch = ''
    cp -r ${imgui}/include/imgui third-party/imgui
    cp -r ${imgui.src}/* third-party/imgui/imgui
    chmod -R u+w third-party/imgui
  '' + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") ''
    substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \
      --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter"
@@ -45,10 +46,6 @@ stdenv.mkDerivation rec {
    "-DIMTUI_INSTALL_IMGUI_HEADERS:BOOL=OFF"
  ];

  postInstall = ''
    rm -rf $out/include/imgui
  '';

  meta = with lib; {
    description = "Immediate mode text-based user interface library";
    longDescription = ''
+3 −1
Original line number Diff line number Diff line
@@ -21466,7 +21466,9 @@ with pkgs;
  ilmbase = callPackage ../development/libraries/ilmbase { };
  imgui = callPackage ../development/libraries/imgui { };
  imgui = callPackage ../development/libraries/imgui {
    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
  };
  imtui = callPackage ../development/libraries/imtui { };