Therapist needs to depend on the DF version, since it uses its MD5
This commit is contained in:
parent
7a5521537a
commit
fe847fcc92
|
@ -64,10 +64,18 @@ let
|
|||
|
||||
dfhack = callPackage ./dfhack {
|
||||
inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
|
||||
inherit dfVersion;
|
||||
inherit twbt;
|
||||
inherit dfVersion twbt;
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
|
||||
inherit dwarf-fortress;
|
||||
dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
|
||||
texlive = pkgs.texlive.combine {
|
||||
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
callPackage ./wrapper {
|
||||
inherit (self) themes;
|
||||
|
@ -76,41 +84,33 @@ let
|
|||
dwarf-fortress-unfuck = dwarf-fortress-unfuck;
|
||||
twbt = twbt;
|
||||
dfhack = dfhack;
|
||||
dwarf-therapist = dwarf-therapist;
|
||||
};
|
||||
}) (lib.attrNames self.df-hashes));
|
||||
|
||||
self = rec {
|
||||
df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
|
||||
|
||||
|
||||
# Aliases for the latest Dwarf Fortress and the selected Therapist install
|
||||
dwarf-fortress = getAttr (versionToName latestVersion) df-games;
|
||||
dwarf-therapist = dwarf-fortress.dwarf-therapist;
|
||||
dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
|
||||
|
||||
dwarf-fortress-full = callPackage ./lazy-pack.nix {
|
||||
inherit versionToName;
|
||||
inherit latestVersion;
|
||||
inherit df-games;
|
||||
inherit df-games versionToName latestVersion;
|
||||
};
|
||||
|
||||
|
||||
soundSense = callPackage ./soundsense.nix { };
|
||||
|
||||
dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
|
||||
inherit (dwarf-fortress) dwarf-fortress;
|
||||
dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
|
||||
texlive = pkgs.texlive.combine {
|
||||
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
legends-browser = callPackage ./legends-browser {};
|
||||
|
||||
themes = recurseIntoAttrs (callPackage ./themes {
|
||||
stdenv = stdenvNoCC;
|
||||
});
|
||||
|
||||
# aliases
|
||||
# Theme aliases
|
||||
phoebus-theme = themes.phoebus;
|
||||
cla-theme = themes.cla;
|
||||
dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
|
||||
};
|
||||
|
||||
in self // df-games
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
, enableTWBT ? enableDFHack
|
||||
, enableSoundSense ? true
|
||||
, enableStoneSense ? true
|
||||
, enableDwarfTherapist ? true, dwarf-therapist
|
||||
, enableDwarfTherapist ? true
|
||||
, enableLegendsBrowser ? true, legends-browser
|
||||
, theme ? themes.phoebus
|
||||
# General config options:
|
||||
|
@ -24,6 +24,7 @@ let
|
|||
dwarf-fortress = if hasAttr dfGame df-games
|
||||
then getAttr dfGame df-games
|
||||
else throw "Unknown Dwarf Fortress version: ${dfVersion}";
|
||||
dwarf-therapist = dwarf-fortress.dwarf-therapist;
|
||||
in
|
||||
buildEnv {
|
||||
name = "dwarf-fortress-full";
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, lib, buildEnv, substituteAll
|
||||
, dwarf-fortress, dwarf-fortress-unfuck
|
||||
, dwarf-therapist
|
||||
, enableDFHack ? false, dfhack
|
||||
, enableSoundSense ? false, soundSense, jdk
|
||||
, enableStoneSense ? false
|
||||
|
@ -89,7 +90,7 @@ stdenv.mkDerivation rec {
|
|||
runDFHack = ./dfhack.in;
|
||||
runSoundSense = ./soundSense.in;
|
||||
|
||||
passthru = { inherit dwarf-fortress; };
|
||||
passthru = { inherit dwarf-fortress dwarf-therapist; };
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
|
|
Loading…
Reference in a new issue