about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorFrancesco Gazzetta <fgaz@fgaz.me>2021-03-27 18:54:47 +0100
committerFrancesco Gazzetta <fgaz@fgaz.me>2021-03-27 19:40:43 +0100
commitc91cafb66a15ca31f98f68705cdc9e05ace9cb33 (patch)
treee8115ef2bf5774ce5a93d2096165491d35d3994d /pkgs/games
parent9cc8c600c660082a7d789b7645123e3ce7b7936b (diff)
_20kly: 1.4 -> 1.5.0
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/20kly/default.nix32
1 files changed, 19 insertions, 13 deletions
diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix
index 7cc2ea6220ee5..0cc61367e28ec 100644
--- a/pkgs/games/20kly/default.nix
+++ b/pkgs/games/20kly/default.nix
@@ -1,16 +1,19 @@
 { lib
-, fetchurl
-, python2 }:
+, fetchFromGitHub
+, python3Packages
+}:
 
-python2.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "20kly";
-  version = "1.4";
+  version = "1.5.0";
+
   format = "other";
-  disabled = !(python2.isPy2 or false);
 
-  src = fetchurl {
-    url = "http://jwhitham.org.uk/20kly/lightyears-${version}.tar.bz2";
-    sha256 = "13h73cmfjqkipffimfc4iv0hf89if490ng6vd6xf3wcalpgaim5d";
+  src = fetchFromGitHub {
+    owner = "20kly";
+    repo = "20kly";
+    rev = "v${version}";
+    sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
   };
 
   patchPhase = ''
@@ -20,21 +23,24 @@ python2.pkgs.buildPythonApplication rec {
         "LIGHTYEARS_DIR = \"$out/share\""
   '';
 
-  propagatedBuildInputs = with python2.pkgs; [ pygame ];
+  propagatedBuildInputs = with python3Packages; [
+    pygame
+  ];
 
-  buildPhase = "python -O -m compileall .";
+  buildPhase = ''
+    python -O -m compileall .
+  '';
 
   installPhase = ''
     mkdir -p "$out/share"
-    cp -r audio code data lightyears "$out/share"
+    cp -r data lib20k lightyears "$out/share"
     install -Dm755 lightyears "$out/bin/lightyears"
   '';
 
   meta = with lib; {
     description = "A steampunk-themed strategy game where you have to manage a steam supply network";
     homepage = "http://jwhitham.org.uk/20kly/";
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     maintainers = with maintainers; [ fgaz ];
   };
 }
-