From d7f63337b99ea990d3f9d0b29971c984e097f24a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Dec 2025 13:01:41 +0000 Subject: [PATCH 1/3] implot: 0.16 -> 0.17 --- pkgs/by-name/im/implot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/implot/package.nix b/pkgs/by-name/im/implot/package.nix index 541e85c73f58..5d00625ede02 100644 --- a/pkgs/by-name/im/implot/package.nix +++ b/pkgs/by-name/im/implot/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "implot"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "epezent"; repo = "implot"; rev = "v${version}"; - hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0="; + hash = "sha256-HNzNRHPLr352EDkAci4nx5qQnPI308rGH8yHkF+n5OY="; }; cmakeRules = "${vcpkg.src}/ports/implot"; From ddfc0301a312dd810ad711278d82236fa6e3cb0d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 2 Feb 2026 14:15:59 +0100 Subject: [PATCH 2/3] implot: fix tests --- pkgs/by-name/im/implot/demos/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix index 6ddde64aaaae..5c5ae8ca6d27 100644 --- a/pkgs/by-name/im/implot/demos/default.nix +++ b/pkgs/by-name/im/implot/demos/default.nix @@ -46,7 +46,12 @@ stdenv.mkDerivation { }) ]; - cmakeFlags = [ (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) ]; + cmakeFlags = [ + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") + ]; + + env.NIX_CFLAGS_COMPILE = "-fpermissive"; nativeBuildInputs = [ cmake From 2ffb82eec114d3717a2223949e473d1851359572 Mon Sep 17 00:00:00 2001 From: Else Someone Date: Thu, 9 Apr 2026 04:09:47 +0300 Subject: [PATCH 3/3] imgui: rebase cmakelists patch Post vcpkg update (https://github.com/NixOS/nixpkgs/pull/507064), and accommodating imnodes update (https://github.com/NixOS/nixpkgs/pull/505138#issuecomment-4210519258) --- ...-allow-installing-into-split-outputs.patch | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch b/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch index 48764cc56f25..c0d9f0d63332 100644 --- a/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch +++ b/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch @@ -1,14 +1,17 @@ -From c5fe9a321d83fc70cf30ef999c24377869cedbd8 Mon Sep 17 00:00:00 2001 -From: SomeoneSerge +From 85c36c4a692a229b7ce688ba92fa2bdd5b9d6877 Mon Sep 17 00:00:00 2001 +From: Else Someone Date: Thu, 27 Jun 2024 11:15:38 +0000 Subject: [PATCH] imgui: allow installing into split outputs +Change install(... DESTINATION include) to +install(... DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}. +Use $ where appropriate. --- - ports/imgui/CMakeLists.txt | 74 +++++++++++++++++++++++--------------- - 1 file changed, 45 insertions(+), 29 deletions(-) + ports/imgui/CMakeLists.txt | 78 +++++++++++++++++++++++--------------- + 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt -index 1502a5aff2..be05d29f4f 100644 +index 03eefb8b8f..1b3fa8b285 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -8,13 +8,15 @@ if(APPLE) @@ -28,7 +31,7 @@ index 1502a5aff2..be05d29f4f 100644 ) target_sources( -@@ -154,18 +156,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES) +@@ -174,18 +176,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES) install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}_target @@ -67,7 +70,7 @@ index 1502a5aff2..be05d29f4f 100644 ) endforeach() -@@ -178,47 +194,47 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -198,47 +214,47 @@ if(NOT IMGUI_SKIP_HEADERS) ${CMAKE_CURRENT_SOURCE_DIR}/imstb_rectpack.h ${CMAKE_CURRENT_SOURCE_DIR}/imstb_truetype.h ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.h @@ -126,7 +129,7 @@ index 1502a5aff2..be05d29f4f 100644 endif() if(IMGUI_BUILD_OPENGL3_BINDING) -@@ -227,16 +243,16 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -247,16 +263,16 @@ if(NOT IMGUI_SKIP_HEADERS) ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3_loader.h DESTINATION @@ -146,7 +149,7 @@ index 1502a5aff2..be05d29f4f 100644 endif() if(IMGUI_BUILD_SDLGPU3_BINDING) -@@ -245,24 +261,24 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -265,28 +281,28 @@ if(NOT IMGUI_SKIP_HEADERS) ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3.h ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3_shaders.h DESTINATION @@ -170,13 +173,25 @@ index 1502a5aff2..be05d29f4f 100644 + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() + if(IMGUI_BUILD_WEBGPU_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_wgpu.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_wgpu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + if(IMGUI_FREETYPE) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() if(IMGUI_TEST_ENGINE) -@@ -285,13 +301,13 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -303,19 +319,19 @@ if(NOT IMGUI_SKIP_HEADERS) + ${CMAKE_CURRENT_SOURCE_DIR}/test-engine/imgui_te_ui.h + ${CMAKE_CURRENT_SOURCE_DIR}/test-engine/imgui_te_utils.h + DESTINATION +- include ++ ${CMAKE_INSTALL_INCLUDEDIR} + ) + endif() endif() include(CMakePackageConfigHelpers) @@ -194,5 +209,5 @@ index 1502a5aff2..be05d29f4f 100644 + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ) -- -2.47.2 +2.53.0