pyrox.dev
lol
box2d: 3.1.0 -> 3.1.1 (#413825)
authored by
Gaétan Lepage
and committed by
GitHub
04066e60
0899a0e4
+6
-4
+4
-2
pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch
+4
-2
pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch
···
1
1
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
2
-
index 5020345..97af8c6 100644
2
+
index 46d5a23..7572b0b 100644
3
3
--- a/samples/CMakeLists.txt
4
4
+++ b/samples/CMakeLists.txt
5
-
@@ -17,47 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples")
5
+
@@ -17,49 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples")
6
6
set(GLFW_BUILD_TESTS OFF CACHE BOOL "GLFW Tests")
7
7
set(GLFW_INSTALL OFF CACHE BOOL "GLFW Install")
8
8
···
43
43
-target_link_libraries(imgui PUBLIC glfw glad)
44
44
-target_include_directories(imgui PUBLIC ${IMGUI_DIR} ${IMGUI_DIR}/backends)
45
45
-target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS)
46
+
-# The sample app also uses stb_truetype and this keeps the symbols separate
47
+
-target_compile_definitions(imgui PRIVATE IMGUI_STB_NAMESPACE=imgui_stb)
46
48
-set_target_properties(imgui PROPERTIES
47
49
- CXX_STANDARD 20
48
50
- CXX_STANDARD_REQUIRED YES
+2
-2
pkgs/by-name/bo/box2d/package.nix
+2
-2
pkgs/by-name/bo/box2d/package.nix
···
30
30
in
31
31
stdenv.mkDerivation (finalAttrs: {
32
32
pname = "box2d";
33
-
version = "3.1.0";
33
+
version = "3.1.1";
34
34
35
35
src = fetchFromGitHub {
36
36
owner = "erincatto";
37
37
repo = "box2d";
38
38
tag = "v${finalAttrs.version}";
39
-
hash = "sha256-QTSU1+9x8GoUK3hlTDMh43fc4vbNfFR7syt6xVHIuPs=";
39
+
hash = "sha256-IqQy9A8fWLG9H8ZPmOXeFZDaaks84miRuzXaFlNwm0g=";
40
40
};
41
41
42
42
patches = [