buildenv: pass preferLocalBuild & allowSubstitutes

Avoids an `.overrideAttrs` invocation in `buildTexliveCombinedEnv`.
NixOS · Apr 25, 2021 · c588d0e · c588d0e
1 parent d822ae0
commit c588d0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
@@ -40,6 +40,9 @@ lib.makeOverridable
 , nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`.
 , buildInputs ? []
 
+, preferLocalBuild ? true
+, allowSubstitutes ? false
+
 , passthru ? {}
 , meta ? {}
 }:
@@ -55,7 +58,8 @@ runCommand name
   rec {
     inherit manifest ignoreCollisions checkCollisionContents passthru
             meta pathsToLink extraPrefix postBuild
-            nativeBuildInputs buildInputs;
+            nativeBuildInputs buildInputs
+            preferLocalBuild allowSubstitutes;
     pkgs = builtins.toJSON (map (drv: {
       paths =
         # First add the usual output(s): respect if user has chosen explicitly,
@@ -71,8 +75,6 @@ runCommand name
           (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall);
       priority = drv.meta.priority or 5;
     }) paths);
-    preferLocalBuild = true;
-    allowSubstitutes = false;
     # XXX: The size is somewhat arbitrary
     passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
   }

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -41,7 +41,7 @@ let
   mkUniqueOutPaths = pkgs: uniqueStrings
     (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
 
-in (buildEnv {
+in buildEnv {
   name = "texlive-${extraName}-${texliveBin.texliveYear}${extraVersion}";
 
   extraPrefix = "/share/texmf";
@@ -53,6 +53,8 @@ in (buildEnv {
     "/tex/generic/config" # make it a real directory for scheme-infraonly
   ];
 
+  allowSubstitutes = true;
+
   buildInputs = [ makeWrapper ] ++ pkgList.extraInputs;
 
   # This is set primarily to help find-tarballs.nix to do its job
@@ -279,6 +281,6 @@ in (buildEnv {
   ''
     + texliveBin.cleanBrokenLinks
   ;
-}).overrideAttrs (_: { allowSubstitutes = true; })
+}
 # TODO: make TeX fonts visible by fontconfig: it should be enough to install an appropriate file
 #       similarly, deal with xe(la)tex font visibility?