From ccc56fb2767c66e7061e409b78cae69091e02c4b Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 7 Jun 2023 15:56:43 -0700 Subject: [PATCH] _7kaa: 2.15.4p1 -> 2.15.5 --- pkgs/games/7kaa/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix index ad128d4e1270..f9cd1a457b19 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 = ''