pyrox.dev
Merge pull request #236544 from tjni/7kaa
_7kaa: 2.15.4p1 -> 2.15.5
+10
-10
pkgs/games/7kaa/default.nix
+10
-10
pkgs/games/7kaa/default.nix
···
2
2
, stdenv
3
3
, gccStdenv
4
4
, autoreconfHook
5
+
, autoconf-archive
5
6
, pkg-config
6
7
, fetchurl
7
8
, fetchFromGitHub
···
16
17
17
18
let
18
19
pname = "7kaa";
19
-
version = "2.15.4p1";
20
+
version = "2.15.5";
20
21
22
+
musicVersion = lib.versions.majorMinor version;
21
23
music = stdenv.mkDerivation {
22
24
pname = "7kaa-music";
23
-
version = lib.versions.majorMinor version;
25
+
version = musicVersion;
24
26
25
27
src = fetchurl {
26
-
url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2";
27
-
sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";
28
+
url = "https://www.7kfans.com/downloads/7kaa-music-${musicVersion}.tar.bz2";
29
+
hash = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";
28
30
};
29
31
30
32
installPhase = ''
···
33
35
'';
34
36
35
37
meta.license = lib.licenses.unfree;
36
-
37
38
};
38
-
39
39
in
40
-
41
40
gccStdenv.mkDerivation rec {
42
41
inherit pname version;
43
42
44
43
src = fetchFromGitHub {
45
44
owner = "the3dfxdude";
46
45
repo = pname;
47
-
rev = "9db2a43e1baee25a44b7aa7e9cedde9a107ed34b";
48
-
sha256 = "sha256-OAKaRuPP0/n8pO3wIUvGKs6n+U+EmZXUTywXYDAan1o=";
46
+
rev = "v${version}";
47
+
hash = "sha256-Z6TsR6L6vwpzoKTj6xJ6HKy4DxcUBWmYBFi/a9pQBD8=";
49
48
};
50
49
51
-
nativeBuildInputs = [ autoreconfHook pkg-config ];
50
+
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
51
+
52
52
buildInputs = [ openal enet SDL2 curl gettext libiconv ];
53
53
54
54
preAutoreconf = ''