diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix
index ec078caaf7cb..5c5a2f6273a1 100644
--- a/pkgs/applications/graphics/inkscape/extensions.nix
+++ b/pkgs/applications/graphics/inkscape/extensions.nix
@@ -5,7 +5,7 @@
   runCommand,
   inkcut,
   callPackage,
-  texlive,
+  texliveBasic,
 }:
 
 {
@@ -51,7 +51,7 @@
   inkstitch = callPackage ./extensions/inkstitch { };
   silhouette = callPackage ./extensions/silhouette { };
   textext = callPackage ./extensions/textext {
-    pdflatex = texlive.combined.scheme-basic;
-    lualatex = texlive.combined.scheme-basic;
+    pdflatex = texliveBasic;
+    lualatex = texliveBasic;
   };
 }
diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
index 84bb01ed7a04..9c754efdfb61 100644
--- a/pkgs/by-name/au/auto-multiple-choice/package.nix
+++ b/pkgs/by-name/au/auto-multiple-choice/package.nix
@@ -63,6 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
   # There's only the Makefile
   dontConfigure = true;
 
+  outputs = [
+    "out"
+    "man"
+    "tex"
+    "texdoc"
+  ];
+
   makeFlags = [
     "PERLPATH=${perlWithPackages}/bin/perl"
     # We *need* to set DESTDIR as empty and use absolute paths below,
@@ -74,8 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
     "BINDIR=${placeholder "out"}/bin"
     "PERLDIR=${placeholder "out"}/share/perl5"
     "MODSDIR=${placeholder "out"}/lib"
-    "TEXDIR=${placeholder "out"}/tex/latex/" # what texlive.combine expects
-    "TEXDOCDIR=${placeholder "out"}/share/doc/texmf/" # TODO where to put this?
+    "TEXDIR=${placeholder "tex"}/tex/latex/auto-multiple-choice/" # what texlive.withPackages expects
+    "TEXDOCDIR=${placeholder "texdoc"}/doc/latex/auto-multiple-choice/"
     "MAN1DIR=${placeholder "out"}/share/man/man1"
     "DESKTOPDIR=${placeholder "out"}/share/applications"
     "METAINFODIR=${placeholder "out"}/share/metainfo"
@@ -109,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
         netpbm
       ]
     } \
-    --set TEXINPUTS ".:$out/tex/latex:"
+    --set TEXINPUTS ".:$tex/tex/latex:"
   '';
 
   nativeBuildInputs = [
@@ -161,10 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
       …
       environment.systemPackages = with pkgs; [
         auto-multiple-choice
-        (texlive.combine {
-          inherit (pkgs.texlive) scheme-full;
-          inherit auto-multiple-choice;
-        })
+        (texliveFull.withPackages (_: [auto-multiple-choice.tex]))
       ];
       </screen>
 
diff --git a/pkgs/by-name/ex/extractpdfmark/package.nix b/pkgs/by-name/ex/extractpdfmark/package.nix
index ffda241e9ef6..4fbf47da5f27 100644
--- a/pkgs/by-name/ex/extractpdfmark/package.nix
+++ b/pkgs/by-name/ex/extractpdfmark/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   poppler,
   stdenv,
-  texlive,
+  texliveMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [
     ghostscript
-    texlive.combined.scheme-minimal
+    texliveMinimal
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pylatex/default.nix b/pkgs/development/python-modules/pylatex/default.nix
index 1b2cf10a00d9..e2b57b9c5c9c 100644
--- a/pkgs/development/python-modules/pylatex/default.nix
+++ b/pkgs/development/python-modules/pylatex/default.nix
@@ -7,7 +7,7 @@
   pytestCheckHook,
   matplotlib,
   quantities,
-  texlive,
+  texliveSmall,
 }:
 
 buildPythonPackage rec {
@@ -35,7 +35,12 @@ buildPythonPackage rec {
     pytestCheckHook
     matplotlib
     quantities
-    (texlive.combine { inherit (texlive) scheme-small lastpage collection-fontsrecommended; })
+    (texliveSmall.withPackages (
+      ps: with ps; [
+        lastpage
+        collection-fontsrecommended
+      ]
+    ))
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pytikz-allefeld/default.nix b/pkgs/development/python-modules/pytikz-allefeld/default.nix
index 47a153c7af9d..c6b193d3e786 100644
--- a/pkgs/development/python-modules/pytikz-allefeld/default.nix
+++ b/pkgs/development/python-modules/pytikz-allefeld/default.nix
@@ -6,7 +6,7 @@
   pymupdf,
   numpy,
   ipython,
-  texlive,
+  texliveSmall,
 }:
 
 buildPythonPackage {
@@ -31,7 +31,7 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "tikz" ];
 
-  nativeCheckInputs = [ texlive.combined.scheme-small ];
+  nativeCheckInputs = [ texliveSmall ];
   checkPhase = ''
     runHook preCheck
     python -c 'if 1: