diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-11-06 16:47:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 16:47:04 -0500 |
| commit | 93b63a2cabbd80a7c7727b447664714757defa6a (patch) | |
| tree | 84a5b7cdbaae36f211fa8af9a351bd42b9abc133 /pkgs/misc | |
| parent | 61a70ae22d3cf4ed3ad5229e7f4b0804c63ac104 (diff) | |
| parent | f5edeac421435433eb651ae520ae0b9994c2d07b (diff) | |
Merge pull request #265514 from xworld21/treewide-texlive-with-packages
treewide: switch to texlive.withPackages
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/sagetex/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 17c271793aa59..5663e5dec9274 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -3,9 +3,7 @@ , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf , makeWrapper, t1utils, boehmgc, rsync -, texlive, tex ? texlive.combine { - inherit (texlive) scheme-small lh metafont epsf fontinst; - } +, texliveSmall, tex ? texliveSmall.withPackages (ps: with ps; [ lh metafont epsf fontinst ]) }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/misc/sagetex/default.nix index f1db705afdd1b..96513b4f9f396 100644 --- a/pkgs/misc/sagetex/default.nix +++ b/pkgs/misc/sagetex/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , writeShellScript -, texlive +, texliveBasic }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "tex" ]; nativeBuildInputs = [ - texlive.combined.scheme-basic + texliveBasic # multiple-outputs.sh fails if $out is not defined (writeShellScript "force-tex-output.sh" '' out="''${tex-}" |