texlive.withPackages: use mkDerivation (finalAttrs: { ... }) instead of buildEnv

doc/languages-frameworks/texlive.section.md

@@ -34,13 +34,11 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c
   ```
   Note that the packages in `texlive.pkgs` are only provided for search purposes and must not be used directly.
 
-- **Experimental and subject to change without notice:** to add the documentation for all packages in the environment, use
+- To add the documentation for all packages in the environment, use
   ```nix
-  texliveSmall.__overrideTeXConfig { withDocs = true; }
+  texliveSmall.overrideAttrs { withDocs = true; }
   ```
-  This can be applied before or after calling `withPackages`.
-
-  The function currently support the parameters `withDocs`, `withSources`, and `requireTeXPackages`.
+  This can be applied before or after calling `withPackages`. The boolean option `withSources` adds source packages.
 
 ## User's guide {#sec-language-texlive-user-guide}
 
@@ -144,13 +142,12 @@ let
       runHook postUnpack
     '';
 
-    nativeBuildInputs = [
-      (texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ]))
-      # multiple-outputs.sh fails if $out is not defined
-      (writeShellScript "force-tex-output.sh" ''
-        out="''${tex-}"
-      '')
-    ];
+    nativeBuildInputs = [ (texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ])) ];
+
+    # multiple-outputs.sh fails if $out is not defined
+    preHook = ''
+      export out="''${tex-}"
+    '';
 
     dontConfigure = true;
 

pkgs/test/texlive/default.nix

@@ -636,7 +636,7 @@ rec {
         correctLicenses = scheme: builtins.foldl'
                 (acc: pkg: concatLicenses acc (lib.toList (pkg.meta.license or [])))
                 []
-                scheme.passthru.requiredTeXPackages;
+                scheme.passthru.includedTeXPackages;
         correctLicensesAttrNames = scheme:
           lib.sort lt
             (map licenseToAttrName (correctLicenses scheme));