Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'

1 files changed, 8 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/games/dwarf-fortress/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/default.nix
index 88a6d72bc485..2580e870321c 100644
--- a/nixpkgs/pkgs/games/dwarf-fortress/default.nix
+++ b/nixpkgs/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;