summary refs log tree commit diff
path: root/pkgs/games/dwarf-fortress/dwarf-therapist
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/games/dwarf-fortress/dwarf-therapist')
-rw-r--r--pkgs/games/dwarf-fortress/dwarf-therapist/default.nix14
-rw-r--r--pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix6
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index e7ef9a02eb70..c330471f430c 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
-  version = "37.0.0-Hello71";
+  version = "39.0.0";
 
   src = fetchFromGitHub {
-    ## We use `Hello71`'s fork for 43.05 support
-    # owner = "splintermind";
-    owner = "Hello71";
+    owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
-    rev = "42ccaa71f6077ebdd41543255a360c3470812b97";
-    sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz";
+    rev = "8ae293a6b45333bbf30644d11d1987651e53a307";
+    sha256 = "0p1127agr2a97gp5chgdkaa0wf02hqgx82yid1cvqpyj8amal6yg";
   };
 
   outputs = [ "out" "layouts" ];
@@ -33,9 +31,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
-    maintainers = with maintainers; [ the-kenny abbradar ];
+    maintainers = with maintainers; [ the-kenny abbradar bendlas ];
     license = licenses.mit;
     platforms = platforms.linux;
-    homepage = https://github.com/splintermind/Dwarf-Therapist;
+    homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist;
   };
 }
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 3a1a52d44cdb..6debf0bb0b2b 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,9 +1,11 @@
-{ symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
+{ stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
 
 let
   df = dwarf-fortress-original;
   dt = dwarf-therapist-original;
-  inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini";
+  platformSlug = if stdenv.targetPlatform.is32bit then
+    "linux32" else "linux64";
+  inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini";
   dfHashFile = "${df}/hash.md5";
 
 in symlinkJoin {