public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwarf-fortress-packages.dwarf-therapist: update for df 43.05

Browse Source 
Similar to the LNP, we use Hello71's fork, which features support for
the (first 64bit) version 43.05 of Dwarf Fortress.

http://dffd.bay12games.com/file.php?id=12762
This commit is contained in:
Herwig Hochleitner 2017-07-28 12:08:32 +02:00
parent 59b35013bc
commit d6ee81e912
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -1,29 +1,34 @@
{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }: { stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-therapist-original-${version}"; name = "dwarf-therapist-original-${version}";
version = "37.0.0"; version = "37.0.0-Hello71";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "splintermind"; ## We use `Hello71`'s fork for 43.05 support
# owner = "splintermind";
owner = "Hello71";
repo = "Dwarf-Therapist"; repo = "Dwarf-Therapist";
rev = "v${version}"; rev = "42ccaa71f6077ebdd41543255a360c3470812b97";
sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d"; sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz";
}; };
outputs = [ "out" "layouts" ]; outputs = [ "out" "layouts" ];
buildInputs = [ qtbase qtdeclarative ]; buildInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ texlive qmake ]; nativeBuildInputs = [ texlive cmake ninja ];
enableParallelBuilding = false; configurePhase = ''
cmake -GNinja
'';
# Move layout files so they cannot be found by Therapist buildPhase = ''
postInstall = '' ninja -j$NIX_BUILD_CORES
mkdir -p $layouts '';
mv $out/share/dwarftherapist/memory_layouts/* $layouts
rmdir $out/share/dwarftherapist/memory_layouts installPhase = ''
# Useless symlink mkdir -p $out/bin
rm $out/bin/dwarftherapist cp ./DwarfTherapist $out/bin/DwarfTherapist
cp -r ./share/memory_layouts $layouts
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
View File

@ -3,7 +3,7 @@
let let
df = dwarf-fortress-original; df = dwarf-fortress-original;
dt = dwarf-therapist-original; dt = dwarf-therapist-original;
inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini"; inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini";
dfHashFile = "${df}/hash.md5"; dfHashFile = "${df}/hash.md5";
in symlinkJoin { in symlinkJoin {