about summary refs log tree commit diff
path: root/pkgs/games/7kaa
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2022-04-30 02:45:35 +0200
committerSandro Jäckel <sandro.jaeckel@sap.com>2022-05-03 17:49:34 +0200
commitc660b584ef914cb5be8fdc45de984a725674329d (patch)
treef31246cc1cdcad65a12b621c4ef67384ec44c441 /pkgs/games/7kaa
parent9b310a73db7d4e20d979fe93a32d0eb6f5482e95 (diff)
7kaa: fix nix-env version parsing
Diffstat (limited to 'pkgs/games/7kaa')
-rw-r--r--pkgs/games/7kaa/default.nix17
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix
index 2b74306cd2533..ad128d4e1270e 100644
--- a/pkgs/games/7kaa/default.nix
+++ b/pkgs/games/7kaa/default.nix
@@ -15,17 +15,15 @@
 }:
 
 let
+  pname = "7kaa";
+  version = "2.15.4p1";
 
-  name = "7kaa";
-  versionMajor = "2.15";
-  versionMinor = "4p1";
-
-  music = stdenv.mkDerivation rec {
-    pname = "${name}-music";
-    version = "${versionMajor}";
+  music = stdenv.mkDerivation {
+    pname = "7kaa-music";
+    version = lib.versions.majorMinor version;
 
     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=";
     };
 
@@ -41,8 +39,7 @@ let
 in
 
 gccStdenv.mkDerivation rec {
-  pname = "${name}";
-  version = "v${versionMajor}.${versionMinor}";
+  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "the3dfxdude";