ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Therapist needs to depend on the DF version, since it uses its MD5

Browse Source
This commit is contained in:
Morgan Jones 2018-07-15 06:41:27 +00:00
parent 7a5521537a
commit fe847fcc92
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/games/dwarf-fortress/default.nix
View File

@ -64,10 +64,18 @@ let
dfhack = callPackage ./dfhack { dfhack = callPackage ./dfhack {
inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
inherit dfVersion; inherit dfVersion twbt;
inherit twbt;
stdenv = gccStdenv; 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 in
callPackage ./wrapper { callPackage ./wrapper {
inherit (self) themes; inherit (self) themes;
@ -76,41 +84,33 @@ let
dwarf-fortress-unfuck = dwarf-fortress-unfuck; dwarf-fortress-unfuck = dwarf-fortress-unfuck;
twbt = twbt; twbt = twbt;
dfhack = dfhack; dfhack = dfhack;
dwarf-therapist = dwarf-therapist;
}; };
}) (lib.attrNames self.df-hashes)); }) (lib.attrNames self.df-hashes));
self = rec { self = rec {
df-hashes = builtins.fromJSON (builtins.readFile ./game.json); 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-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 { dwarf-fortress-full = callPackage ./lazy-pack.nix {
inherit versionToName; inherit df-games versionToName latestVersion;
inherit latestVersion;
inherit df-games;
}; };
soundSense = callPackage ./soundsense.nix { }; 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 {}; legends-browser = callPackage ./legends-browser {};
themes = recurseIntoAttrs (callPackage ./themes { themes = recurseIntoAttrs (callPackage ./themes {
stdenv = stdenvNoCC; stdenv = stdenvNoCC;
}); });
# aliases # Theme aliases
phoebus-theme = themes.phoebus; phoebus-theme = themes.phoebus;
cla-theme = themes.cla; cla-theme = themes.cla;
dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
}; };
in self // df-games in self // df-games

3
pkgs/games/dwarf-fortress/lazy-pack.nix
View File

@ -8,7 +8,7 @@
, enableTWBT ? enableDFHack , enableTWBT ? enableDFHack
, enableSoundSense ? true , enableSoundSense ? true
, enableStoneSense ? true , enableStoneSense ? true
, enableDwarfTherapist ? true, dwarf-therapist , enableDwarfTherapist ? true
, enableLegendsBrowser ? true, legends-browser , enableLegendsBrowser ? true, legends-browser
, theme ? themes.phoebus , theme ? themes.phoebus
# General config options: # General config options:
@ -24,6 +24,7 @@ let
dwarf-fortress = if hasAttr dfGame df-games dwarf-fortress = if hasAttr dfGame df-games
then getAttr dfGame df-games then getAttr dfGame df-games
else throw "Unknown Dwarf Fortress version: ${dfVersion}"; else throw "Unknown Dwarf Fortress version: ${dfVersion}";
dwarf-therapist = dwarf-fortress.dwarf-therapist;
in in
buildEnv { buildEnv {
name = "dwarf-fortress-full"; name = "dwarf-fortress-full";

3
pkgs/games/dwarf-fortress/wrapper/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, buildEnv, substituteAll { stdenv, lib, buildEnv, substituteAll
, dwarf-fortress, dwarf-fortress-unfuck , dwarf-fortress, dwarf-fortress-unfuck
, dwarf-therapist
, enableDFHack ? false, dfhack , enableDFHack ? false, dfhack
, enableSoundSense ? false, soundSense, jdk , enableSoundSense ? false, soundSense, jdk
, enableStoneSense ? false , enableStoneSense ? false
@ -89,7 +90,7 @@ stdenv.mkDerivation rec {
runDFHack = ./dfhack.in; runDFHack = ./dfhack.in;
runSoundSense = ./soundSense.in; runSoundSense = ./soundSense.in;
passthru = { inherit dwarf-fortress; }; passthru = { inherit dwarf-fortress dwarf-therapist; };
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin