diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 0618a55df44..be7f978a42a 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,7 +147,9 @@ let in stdenv.mkDerivation rec { - pname = "asciidoc"; + pname = "asciidoc" + + lib.optionalString enableStandardFeatures "-full" + + lib.optionalString enableExtraPlugins "-with-plugins"; version = "9.1.0"; # Note: a substitution to improve reproducibility should be updated once 10.0.0 is diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15a354b4669..22310660f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3884,20 +3884,20 @@ with pkgs; enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (asciidoc.override { + asciidoc-full = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; - }); + }; - asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { + asciidoc-full-with-plugins = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; enableExtraPlugins = true; - }); + }; asciidoctor = callPackage ../tools/typesetting/asciidoctor { };