From 8ada8e2b257048e115dd8516188caff7042bbdd4 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:02:31 +0000 Subject: [PATCH] dwarf-fortress: replace texlive.combine with texliveBasic.withPackages --- pkgs/games/dwarf-fortress/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index dd8e6b5503da..55157950c4f2 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texlive, perlPackages, jdk8, jre8 }: +{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }: # To whomever it may concern: # @@ -46,9 +46,7 @@ let versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { - texlive = texlive.combine { - inherit (texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; + texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); }; # A map of names to each Dwarf Fortress package we know about.