b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #236544 from tjni/7kaa

Browse source 
_7kaa: 2.15.4p1 -> 2.15.5
This commit is contained in:
Sandro 2023-06-14 19:46:52 +02:00 committed by GitHub
parent 0138c0f6ed ccc56fb276
commit afa8ae289a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/games/7kaa/default.nix
View file

@ -2,6 +2,7 @@
, stdenv , stdenv
, gccStdenv , gccStdenv
, autoreconfHook , autoreconfHook
, autoconf-archive
, pkg-config , pkg-config
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
@ -16,15 +17,16 @@
let let
pname = "7kaa"; pname = "7kaa";
version = "2.15.4p1"; version = "2.15.5";
musicVersion = lib.versions.majorMinor version;
music = stdenv.mkDerivation { music = stdenv.mkDerivation {
pname = "7kaa-music"; pname = "7kaa-music";
version = lib.versions.majorMinor version; version = musicVersion;
src = fetchurl { src = fetchurl {
url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2"; url = "https://www.7kfans.com/downloads/7kaa-music-${musicVersion}.tar.bz2";
sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; hash = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";
}; };
installPhase = '' installPhase = ''
@ -33,22 +35,20 @@ let
''; '';
meta.license = lib.licenses.unfree; meta.license = lib.licenses.unfree;
}; };
in in
gccStdenv.mkDerivation rec { gccStdenv.mkDerivation rec {
inherit pname version; inherit pname version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "the3dfxdude"; owner = "the3dfxdude";
repo = pname; repo = pname;
rev = "9db2a43e1baee25a44b7aa7e9cedde9a107ed34b"; rev = "v${version}";
sha256 = "sha256-OAKaRuPP0/n8pO3wIUvGKs6n+U+EmZXUTywXYDAan1o="; hash = "sha256-Z6TsR6L6vwpzoKTj6xJ6HKy4DxcUBWmYBFi/a9pQBD8=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
buildInputs = [ openal enet SDL2 curl gettext libiconv ]; buildInputs = [ openal enet SDL2 curl gettext libiconv ];
preAutoreconf = '' preAutoreconf = ''