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

dwarf-fortress-packages.dwarf-therapist-original: expose to package set 

Needed for it to be built on Hydra.
This commit is contained in:
Nikolay Amiantov 2019-06-10 18:26:09 +03:00
parent b6db1b9edf
commit ccbb08ed88
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,12 @@ let
# Converts a version to a package name. # Converts a version to a package name.
versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
texlive = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
};
};
# A map of names to each Dwarf Fortress package we know about. # A map of names to each Dwarf Fortress package we know about.
df-games = lib.listToAttrs (map (dfVersion: { df-games = lib.listToAttrs (map (dfVersion: {
name = versionToName dfVersion; name = versionToName dfVersion;
@ -70,11 +76,7 @@ let
dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
inherit dwarf-fortress; inherit dwarf-fortress;
dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { dwarf-therapist = dwarf-therapist-original;
texlive = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
};
};
}; };
in in
callPackage ./wrapper { callPackage ./wrapper {
@ -93,6 +95,7 @@ let
# Aliases for the latest Dwarf Fortress and the selected Therapist install # 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;
inherit dwarf-therapist-original;
dwarf-therapist = dwarf-fortress.dwarf-therapist; dwarf-therapist = dwarf-fortress.dwarf-therapist;
dwarf-fortress-original = dwarf-fortress.dwarf-fortress; dwarf-fortress-original = dwarf-fortress.dwarf-fortress;