pyrox.dev
performous: 1.2.0 -> 1.3.0
+14
-8
pkgs/games/performous/default.nix
+14
-8
pkgs/games/performous/default.nix
···
5
5
, aubio
6
6
, boost
7
7
, cmake
8
-
, ffmpeg_4
8
+
, ffmpeg
9
+
, fmt
9
10
, gettext
10
-
, git
11
11
, glew
12
12
, glibmm
13
13
, glm
···
15
15
, libepoxy
16
16
, librsvg
17
17
, libxmlxx
18
+
, nlohmann_json
18
19
, pango
19
20
, pkg-config
20
21
, portaudio
···
22
23
23
24
stdenv.mkDerivation rec {
24
25
pname = "performous";
25
-
version = "1.2.0";
26
+
version = "1.3.0";
26
27
27
28
src = fetchFromGitHub {
28
-
owner = pname;
29
-
repo = pname;
29
+
owner = "performous";
30
+
repo = "performous";
30
31
rev = "refs/tags/${version}";
31
-
hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg=";
32
+
hash = "sha256-y7kxLht15vULN9NxM0wzj9+7Uq4/3D5j9oBEnrTIwQ8=";
32
33
};
33
34
34
35
cedSrc = fetchFromGitHub {
35
-
owner = pname;
36
+
owner = "performous";
36
37
repo = "compact_enc_det";
37
38
rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e";
38
39
hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec=";
···
46
47
postPatch = ''
47
48
mkdir ced-src
48
49
cp -R ${cedSrc}/* ced-src
50
+
51
+
substituteInPlace data/CMakeLists.txt \
52
+
--replace "/usr" "$out"
49
53
'';
50
54
51
55
nativeBuildInputs = [
···
58
62
SDL2
59
63
aubio
60
64
boost
61
-
ffmpeg_4
65
+
ffmpeg
66
+
fmt
62
67
glew
63
68
glibmm
64
69
glm
···
66
71
libepoxy
67
72
librsvg
68
73
libxmlxx
74
+
nlohmann_json
69
75
pango
70
76
portaudio
71
77
];
+16
-20
pkgs/games/performous/performous-cmake.patch
+16
-20
pkgs/games/performous/performous-cmake.patch
···
1
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
-
index 48af2a89..43786c31 100644
3
-
--- a/CMakeLists.txt
4
-
+++ b/CMakeLists.txt
5
-
@@ -75,15 +75,7 @@ else()
6
-
message(STATUS "Localization disabled: Gettext tools (msgfmt) missing")
7
-
endif()
8
-
9
-
-include(FetchContent)
10
-
-FetchContent_Declare(ced-sources
11
-
- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git
12
-
- #https://github.com/google/compact_enc_det.git
13
-
- GIT_TAG master
14
-
- SOURCE_DIR ced-src
15
-
-)
1
+
diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake
2
+
index d6e2aca..3085adb 100644
3
+
--- a/cmake/Modules/FindCed.cmake
4
+
+++ b/cmake/Modules/FindCed.cmake
5
+
@@ -1,11 +1 @@
6
+
-include(LibFetchMacros)
16
7
-
17
-
-FetchContent_MakeAvailable(ced-sources)
18
-
+add_subdirectory(ced-src)
19
-
20
-
option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE)
21
-
8
+
-set(Ced_GIT_VERSION "master")
9
+
-
10
+
-libfetch_git_pkg(Ced
11
+
- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git
12
+
- #https://github.com/google/compact_enc_det.git
13
+
- REFERENCE ${Ced_GIT_VERSION}
14
+
- FIND_PATH compact_enc_det/compact_enc_det.h
15
+
-)
16
+
-message(STATUS "Found Google CED ${Ced_VERSION}")
17
+
+add_subdirectory(../ced-src ced-src)