Merge pull request #170974 from SuperSandro2000/7kaa

This commit is contained in:
Sandro 2022-05-04 11:51:40 +02:00 committed by GitHub
commit 2f900ae0ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -15,17 +15,15 @@
}: }:
let let
pname = "7kaa";
version = "2.15.4p1";
name = "7kaa"; music = stdenv.mkDerivation {
versionMajor = "2.15"; pname = "7kaa-music";
versionMinor = "4p1"; version = lib.versions.majorMinor version;
music = stdenv.mkDerivation rec {
pname = "${name}-music";
version = "${versionMajor}";
src = fetchurl { src = fetchurl {
url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2";
sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";
}; };
@ -41,8 +39,7 @@ let
in in
gccStdenv.mkDerivation rec { gccStdenv.mkDerivation rec {
pname = "${name}"; inherit pname version;
version = "v${versionMajor}.${versionMinor}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "the3dfxdude"; owner = "the3dfxdude";