Merge pull request #236544 from tjni/7kaa

_7kaa: 2.15.4p1 -> 2.15.5

authored by Sandro and committed by GitHub afa8ae28 0138c0f6

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