Merge pull request #170974 from SuperSandro2000/7kaa

authored by Sandro and committed by GitHub 2f900ae0 ac72b18d

+7 -10
+7 -10
pkgs/games/7kaa/default.nix
··· 15 15 }: 16 16 17 17 let 18 + pname = "7kaa"; 19 + version = "2.15.4p1"; 18 20 19 - name = "7kaa"; 20 - versionMajor = "2.15"; 21 - versionMinor = "4p1"; 22 - 23 - music = stdenv.mkDerivation rec { 24 - pname = "${name}-music"; 25 - version = "${versionMajor}"; 21 + music = stdenv.mkDerivation { 22 + pname = "7kaa-music"; 23 + version = lib.versions.majorMinor version; 26 24 27 25 src = fetchurl { 28 - url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; 26 + url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2"; 29 27 sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; 30 28 }; 31 29 ··· 41 39 in 42 40 43 41 gccStdenv.mkDerivation rec { 44 - pname = "${name}"; 45 - version = "v${versionMajor}.${versionMinor}"; 42 + inherit pname version; 46 43 47 44 src = fetchFromGitHub { 48 45 owner = "the3dfxdude";