From 0c59bde06e6b67797c6feb9acb85a51b38268272 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 30 May 2024 17:03:46 +0200 Subject: [PATCH 1/2] imgui: fix build on darwin --- pkgs/development/libraries/imgui/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ceb616a76e5c..09b88c1a191c 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -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 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 109539a1820a..434a53c14180 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21474,7 +21474,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 { }; From d9ebd6bc08b9fa13dc6649e505134e8f640ed9e0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 30 May 2024 17:16:40 +0200 Subject: [PATCH 2/2] imtui: fix build --- pkgs/development/libraries/imtui/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix index 86b488c1a888..a4f477543b89 100644 --- a/pkgs/development/libraries/imtui/default.nix +++ b/pkgs/development/libraries/imtui/default.nix @@ -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 = ''