pyrox.dev
chiaki: use nanopb from nixpkgs
chiaki currently uses a vendored nanopb that fails to build with the
version of protobuf in nixpkgs. If nanopb is supplied in buildInputs,
the build uses that instead, which resolves the issue. (same fix as
this one on chiaki-ng https://github.com/NixOS/nixpkgs/pull/404622)
Also remove the python and protobuf inputs, since they were only used
for building the vendored nanopb
+2
-7
pkgs/games/chiaki/default.nix
+2
-7
pkgs/games/chiaki/default.nix
···
4
4
fetchgit,
5
5
cmake,
6
6
pkg-config,
7
-
protobuf,
8
-
python3Packages,
9
7
ffmpeg,
10
8
libopus,
11
9
mkDerivation,
···
16
14
libevdev,
17
15
udev,
18
16
qtmacextras,
17
+
nanopb,
19
18
}:
20
19
21
20
mkDerivation rec {
···
32
31
nativeBuildInputs = [
33
32
cmake
34
33
pkg-config
35
-
protobuf
36
-
python3Packages.protobuf
37
-
python3Packages.python
38
-
python3Packages.setuptools
39
34
];
40
35
41
36
buildInputs =
···
45
40
qtbase
46
41
qtmultimedia
47
42
qtsvg
48
-
protobuf
49
43
SDL2
44
+
nanopb
50
45
]
51
46
++ lib.optionals stdenv.hostPlatform.isLinux [
52
47
libevdev