diff --git a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch index dd76023882df..8d0c0eeb4488 100644 --- a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch +++ b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch @@ -1,8 +1,8 @@ diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt -index 5020345..97af8c6 100644 +index 46d5a23..7572b0b 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt -@@ -17,47 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples") +@@ -17,49 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples") set(GLFW_BUILD_TESTS OFF CACHE BOOL "GLFW Tests") set(GLFW_INSTALL OFF CACHE BOOL "GLFW Install") @@ -43,6 +43,8 @@ index 5020345..97af8c6 100644 -target_link_libraries(imgui PUBLIC glfw glad) -target_include_directories(imgui PUBLIC ${IMGUI_DIR} ${IMGUI_DIR}/backends) -target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS) +-# The sample app also uses stb_truetype and this keeps the symbols separate +-target_compile_definitions(imgui PRIVATE IMGUI_STB_NAMESPACE=imgui_stb) -set_target_properties(imgui PROPERTIES - CXX_STANDARD 20 - CXX_STANDARD_REQUIRED YES diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix index 27da46b1027e..8b3057b0288b 100644 --- a/pkgs/by-name/bo/box2d/package.nix +++ b/pkgs/by-name/bo/box2d/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "box2d"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "erincatto"; repo = "box2d"; tag = "v${finalAttrs.version}"; - hash = "sha256-QTSU1+9x8GoUK3hlTDMh43fc4vbNfFR7syt6xVHIuPs="; + hash = "sha256-IqQy9A8fWLG9H8ZPmOXeFZDaaks84miRuzXaFlNwm0g="; }; patches = [