diff options
author | Nikolay Amiantov <ab@fmap.me> | 2019-06-10 18:26:09 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2019-06-10 18:52:52 +0300 |
commit | ccbb08ed8819cf10e0a992707c09828ecb5ed4f6 (patch) | |
tree | d62198c32bcac44e000928bad2bee84e24e43ad5 /pkgs/games/dwarf-fortress | |
parent | b6db1b9edff5f905b9751b6dbc743ce1dc5f8a65 (diff) | |
download | nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.tar nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.tar.gz nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.tar.bz2 nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.tar.lz nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.tar.xz nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.tar.zst nixpkgs-ccbb08ed8819cf10e0a992707c09828ecb5ed4f6.zip |
dwarf-fortress-packages.dwarf-therapist-original: expose to package set
Needed for it to be built on Hydra.
Diffstat (limited to 'pkgs/games/dwarf-fortress')
-rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 88a6d72bc48..2580e870321 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -45,6 +45,12 @@ let # Converts a version to a package name. 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. df-games = lib.listToAttrs (map (dfVersion: { name = versionToName dfVersion; @@ -70,11 +76,7 @@ let 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; - }; - }; + dwarf-therapist = dwarf-therapist-original; }; in callPackage ./wrapper { @@ -93,6 +95,7 @@ let # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; + inherit dwarf-therapist-original; dwarf-therapist = dwarf-fortress.dwarf-therapist; dwarf-fortress-original = dwarf-fortress.dwarf-fortress; |