diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-06-14 19:46:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 19:46:52 +0200 |
| commit | afa8ae289ad65139d930ec92d6ec2edef06c4789 (patch) | |
| tree | 1d1078e849e04f87977984386ff3c2fba24e44b2 /pkgs/games | |
| parent | 0138c0f6edc6cc5cdc2f3894a1adc3e0ace4ce1a (diff) | |
| parent | ccc56fb2767c66e7061e409b78cae69091e02c4b (diff) | |
Merge pull request #236544 from tjni/7kaa
_7kaa: 2.15.4p1 -> 2.15.5
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/7kaa/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix index ad128d4e1270e..f9cd1a457b19f 100644 --- a/pkgs/games/7kaa/default.nix +++ b/pkgs/games/7kaa/default.nix @@ -2,6 +2,7 @@ , stdenv , gccStdenv , autoreconfHook +, autoconf-archive , pkg-config , fetchurl , fetchFromGitHub @@ -16,15 +17,16 @@ let pname = "7kaa"; - version = "2.15.4p1"; + version = "2.15.5"; + musicVersion = lib.versions.majorMinor version; music = stdenv.mkDerivation { pname = "7kaa-music"; - version = lib.versions.majorMinor version; + version = musicVersion; src = fetchurl { - url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2"; - sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; + url = "https://www.7kfans.com/downloads/7kaa-music-${musicVersion}.tar.bz2"; + hash = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; }; installPhase = '' @@ -33,22 +35,20 @@ let ''; meta.license = lib.licenses.unfree; - }; - in - gccStdenv.mkDerivation rec { inherit pname version; src = fetchFromGitHub { owner = "the3dfxdude"; repo = pname; - rev = "9db2a43e1baee25a44b7aa7e9cedde9a107ed34b"; - sha256 = "sha256-OAKaRuPP0/n8pO3wIUvGKs6n+U+EmZXUTywXYDAan1o="; + rev = "v${version}"; + hash = "sha256-Z6TsR6L6vwpzoKTj6xJ6HKy4DxcUBWmYBFi/a9pQBD8="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ]; + buildInputs = [ openal enet SDL2 curl gettext libiconv ]; preAutoreconf = '' |