summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorCole Helbling <cole.e.helbling@outlook.com>2020-08-21 14:00:48 -0700
committerJon <jonringer@users.noreply.github.com>2020-08-21 14:45:53 -0700
commite2b09f42ba613215763873c76ec1c71a5ea7da14 (patch)
tree2f99ccec9d73b8c0893f8088bdbac850bc9e4f82 /pkgs/games
parent50bf68669a9a362422660288c4357a1d4af60119 (diff)
downloadnixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.tar
nixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.tar.gz
nixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.tar.bz2
nixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.tar.lz
nixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.tar.xz
nixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.tar.zst
nixpkgs-e2b09f42ba613215763873c76ec1c71a5ea7da14.zip
dwarf-fortress: TWBT: use fork for dfhack 0.47.04 support
The original mifki TWBT hasn't been updated since April 2019, while
thurin's fork has added support for dfhack 0.47.04-r2. Thus, switch to
thurin's fork when Dwarf Fortress 0.47.04 is used (and ever-so-slightly
special case the url attribute).
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/dwarf-fortress/twbt/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index b5bff0e9b7a..a0990e04f93 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -42,9 +42,10 @@ let
       prerelease = false;
     };
     "0.47.04" = {
-      twbtRelease = "6.61";
-      sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw";
-      prerelease = false;
+      twbtRelease = "6.xx";
+      dfhackRelease = "0.47.04-r2";
+      sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv";
+      prerelease = true;
     };
   };
 
@@ -58,7 +59,11 @@ stdenvNoCC.mkDerivation rec {
   version = release.twbtRelease;
 
   src = fetchurl {
-    url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
+    url =
+      if version == "6.xx" then
+        "https://github.com/thurin/df-twbt/releases/download/${release.dfhackRelease}/twbt-${version}-linux64-${release.dfhackRelease}.zip"
+      else
+        "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
     sha256 = release.sha256;
   };