dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #315917 from wegank/imgui-darwin

Browse Source 
imgui: fix build on darwin
This commit is contained in:
Someone 2024-05-30 23:24:47 +00:00 committed by GitHub
commit b8d134f7cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 =

7
pkgs/development/libraries/imtui/default.nix
View File

@ -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 = ''

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };