pyrox.dev
ja2-stracciatella: 0.17.0 -> 0.21.0
authored by TomaSajt and committed by Alyssa Ross dfdc09bb 6f5506cd
+3
-3
pkgs/by-name/ja/ja2-stracciatella/dont-use-vendored-sdl2.patch
+3
-3
pkgs/by-name/ja/ja2-stracciatella/dont-use-vendored-sdl2.patch
···
9
9
-if(APPLE)
10
10
- file(GLOB APPLE_DIST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/distr-files-mac/*.txt")
11
11
- install(FILES ${APPLE_DIST_FILES} DESTINATION .)
12
-
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.8-macos/SDL2.framework DESTINATION .)
12
+
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.20-macos/SDL2.framework DESTINATION .)
13
13
-endif()
14
14
-
15
-
## Uninstall
15
+
## Build AppImage
16
16
17
-
add_custom_templated_target("uninstall")
17
+
add_custom_target(package-appimage
+23
-10
pkgs/by-name/ja/ja2-stracciatella/package.nix
+23
-10
pkgs/by-name/ja/ja2-stracciatella/package.nix
···
10
10
rustc,
11
11
SDL2,
12
12
fltk,
13
+
lua5_3,
14
+
miniaudio,
13
15
rapidjson,
16
+
sol2,
14
17
gtest,
15
18
}:
16
19
17
20
let
18
21
stringTheory = fetchurl {
19
-
url = "https://github.com/zrax/string_theory/archive/3.1.tar.gz";
20
-
hash = "sha256-gexVFxGpkmCMQrpCJQ/g2BsCpsCsUTSaD1X0PacRmLo=";
22
+
url = "https://github.com/zrax/string_theory/archive/3.8.tar.gz";
23
+
hash = "sha256-mq7pW3qRZs03/SijzbTl1txJHCSW/TO+gvRLWZh/11M=";
24
+
};
25
+
26
+
magicEnum = fetchurl {
27
+
url = "https://github.com/Neargye/magic_enum/archive/v0.8.2.zip";
28
+
hash = "sha256-oQ+mUDB8YJULcSploz+0bprJbqclhc+p/Pmsn1AsAes=";
21
29
};
22
30
in
23
31
stdenv.mkDerivation rec {
24
32
pname = "ja2-stracciatella";
25
-
version = "0.17.0";
33
+
version = "0.21.0";
26
34
27
35
src = fetchFromGitHub {
28
36
owner = "ja2-stracciatella";
29
37
repo = "ja2-stracciatella";
30
38
tag = "v${version}";
31
-
hash = "sha256-0li4o8KutJjpJdviqqqhMvNqhNVBw4L98DIJtebb2VQ=";
39
+
hash = "sha256-zMCFDMSKcsYz5LjW8UJbBlSmuJX6ibr9zIS3BgZMgAg=";
32
40
};
33
41
34
42
patches = [
···
40
48
# Patch dependencies that are usually loaded by url
41
49
substituteInPlace dependencies/lib-string_theory/builder/CMakeLists.txt.in \
42
50
--replace-fail ${stringTheory.url} file://${stringTheory}
51
+
substituteInPlace dependencies/lib-magic_enum/getter/CMakeLists.txt.in \
52
+
--replace-fail ${magicEnum.url} file://${magicEnum}
43
53
'';
44
54
45
55
strictDeps = true;
···
55
65
buildInputs = [
56
66
SDL2
57
67
fltk
68
+
lua5_3
58
69
rapidjson
70
+
sol2
59
71
gtest
60
72
];
61
73
62
74
cargoRoot = "rust";
63
75
64
-
cargoDeps = rustPlatform.fetchCargoTarball {
76
+
cargoDeps = rustPlatform.fetchCargoVendor {
65
77
inherit
66
78
pname
67
79
version
68
80
src
69
81
cargoRoot
70
82
;
71
-
hash = "sha256-zkctR16QIjCTiDmrhFqPPOThbPwsm0T0nlnCekkXNN8=";
83
+
hash = "sha256-5KZa5ocn6Q4qUeRmm7Tymgg09dr6aZoAuJvtF32CXNg=";
72
84
};
73
85
74
86
cmakeFlags = [
87
+
(lib.cmakeBool "FLTK_SKIP_FLUID" true) # otherwise `find_package(FLTK)` fails
88
+
(lib.cmakeBool "LOCAL_LUA_LIB" false)
89
+
(lib.cmakeBool "LOCAL_MINIAUDIO_LIB" false)
90
+
(lib.cmakeFeature "MINIAUDIO_INCLUDE_DIR" "${miniaudio}")
75
91
(lib.cmakeBool "LOCAL_RAPIDJSON_LIB" false)
92
+
(lib.cmakeBool "LOCAL_SOL_LIB" false)
76
93
(lib.cmakeBool "LOCAL_GTEST_LIB" false)
77
94
(lib.cmakeFeature "EXTRA_DATA_DIR" "${placeholder "out"}/share/ja2")
78
95
];
79
-
80
-
# error: 'uint64_t' does not name a type
81
-
# gcc13 and above don't automatically include cstdint
82
-
env.CXXFLAGS = "-include cstdint";
83
96
84
97
doInstallCheck = true;
85
98