pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index 73e69578dc9f..1035bb73904c 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -238,7 +238,7 @@
     for otherOutputName in $outputs ; do
       if [[ "$otherOutputName" == 'out' ]] ; then continue ; fi
       otherOutput="otherOutput_$otherOutputName"
-      ln -s "''${!otherOutput}" "''${!otherOutputName}"
+      cp -r "''${!otherOutput}" "''${!otherOutputName}"
     done
   '' +
     # environment variables (note: only export the ones that are used in the wrappers)

diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index 73e69578dc9f..74db05e3f310 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -32,7 +33,7 @@
 , __extraName ? "combined"
 , __extraVersion ? ""
 # emulate the old texlive.combine (e.g. add man pages to main output)
-, __combine ? false
+, __combine ? true
 # adjust behavior further if called from the texlive.combine wrapper
 , __fromCombineWrapper ? false
 }@args:

diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index 73e69578dc9f..e06ccf5d3103 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -14,6 +14,7 @@
 , toTLPkgSets
 , bash
 , perl
+, xorg
 
   # common runtime dependencies
 , coreutils
@@ -228,6 +229,7 @@
     tl.texlive-scripts # fmtutil, updmap
     tl.texlive-scripts-extra # texlinks
     perl
+    xorg.lndir
   ];
 
   inherit meta passthru;
@@ -238,7 +240,8 @@
     for otherOutputName in $outputs ; do
       if [[ "$otherOutputName" == 'out' ]] ; then continue ; fi
       otherOutput="otherOutput_$otherOutputName"
-      ln -s "''${!otherOutput}" "''${!otherOutputName}"
+      mkdir "''${!otherOutputName}"
+      lndir "''${!otherOutput}"/ "''${!otherOutputName}"/
     done
   '' +
     # environment variables (note: only export the ones that are used in the wrappers)
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index cab889f5f8b3..ee2c4ac5c712 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -10,7 +10,7 @@
 , makeWrapper, installShellFiles
 , python3, ruby, perl, tk, jdk, bash, snobol4
 , coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, html-tidy, ncurses, zip
-, libfaketime, asymptote, biber-ms, makeFontsConf
+, libfaketime, asymptote, biber-ms, makeFontsConf, xorg
 , useFixedHashes ? true
 , recurseIntoAttrs
 }:
@@ -109,7 +109,7 @@
   buildTeXEnv = import ./build-tex-env.nix {
     inherit bin tl;
     ghostscript = ghostscript_headless;
-    inherit lib buildEnv libfaketime makeFontsConf makeWrapper runCommand
+    inherit lib buildEnv libfaketime makeFontsConf makeWrapper runCommand xorg
       writeShellScript writeText toTLPkgSets bash perl coreutils gawk gnugrep gnused;
   };