From 5fcdb283198755f57a67678573cc61e3b11aa4d7 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] asciidoc: replace texlive.combine with texliveMinimal.withPackages --- pkgs/tools/typesetting/asciidoc/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 5e80158d9057..66afb6302593 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -6,7 +6,7 @@ , highlight , pygments , graphviz -, texlive +, texliveMinimal , dblatexFull , libxslt , w3m @@ -55,6 +55,11 @@ let _enableDeckjsBackend = enableExtraPlugins || enableDeckjsBackend; _enableOdfBackend = enableExtraPlugins || enableOdfBackend; + # + # texlive environment + # + texlive = texliveMinimal.withPackages (ps: [ ps.dvipng ]); + # # filters # diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8104528427b2..7430470115b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6585,7 +6585,6 @@ with pkgs; asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (python3.pkgs) pygments matplotlib numpy aafigure recursivePthLoader; - texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = false; };