about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-08-19 20:08:15 +0200
committerGitHub <noreply@github.com>2021-08-19 20:08:15 +0200
commited2fdff7136730d596742f6326f87ed8d20af493 (patch)
treeab34967b1fa89e144ff687f37d85edbc89a616ef /pkgs/games
parent9979cf30eaa652e0bef5dad4c413dbbc764d9e93 (diff)
parent98af443596bfd936025e8058d7f6557c7310e518 (diff)
downloadnixlib-ed2fdff7136730d596742f6326f87ed8d20af493.tar
nixlib-ed2fdff7136730d596742f6326f87ed8d20af493.tar.gz
nixlib-ed2fdff7136730d596742f6326f87ed8d20af493.tar.bz2
nixlib-ed2fdff7136730d596742f6326f87ed8d20af493.tar.lz
nixlib-ed2fdff7136730d596742f6326f87ed8d20af493.tar.xz
nixlib-ed2fdff7136730d596742f6326f87ed8d20af493.tar.zst
nixlib-ed2fdff7136730d596742f6326f87ed8d20af493.zip
Merge pull request #134742 from DeeUnderscore/cataclysm-dda-0.F-1
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/cataclysm-dda/common.nix2
-rw-r--r--pkgs/games/cataclysm-dda/stable.nix9
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index d91db073ff61..ccba8e23d5ae 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
     '';
     homepage = "https://cataclysmdda.org/";
     license = licenses.cc-by-sa-30;
-    maintainers = with maintainers; [ mnacamura ];
+    maintainers = with maintainers; [ mnacamura DeeUnderscore ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix
index ba475ac9601d..a11837447f79 100644
--- a/pkgs/games/cataclysm-dda/stable.nix
+++ b/pkgs/games/cataclysm-dda/stable.nix
@@ -10,15 +10,20 @@ let
   };
 
   self = common.overrideAttrs (common: rec {
-    version = "0.F";
+    version = "0.F-1";
 
     src = fetchFromGitHub {
       owner = "CleverRaven";
       repo = "Cataclysm-DDA";
       rev = version;
-      sha256 = "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3";
+      sha256 = "sha256-bVIln8cLZ15qXpW5iB8Odqk0OQbNLLM8OiKybTzARA0=";
     };
 
+    makeFlags = common.makeFlags ++ [
+      # Makefile declares version as 0.F, even under 0.F-1
+      "VERSION=${version}"
+    ];
+
     meta = common.meta // {
       maintainers = with lib.maintainers;
       common.meta.maintainers ++ [ skeidel ];