Unverified Commit 2adf954e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #55420: buildEnv, substituteAll: disable binary cache 

... into staging.
parents 4c212f6b c706233f

pkgs/build-support/build-fhs-userenv/env.nix

+1 −0
Original line number Diff line number Diff line
@@ -196,4 +196,5 @@ in stdenv.mkDerivation { 
    ${if isMultiBuild then extraBuildCommandsMulti else ""}

  '';

  preferLocalBuild = true;

  allowSubstitutes = false;

}

pkgs/build-support/buildenv/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ runCommand name 
      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 null;

  }

pkgs/build-support/substitute-files/substitute-all-files.nix

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ stdenv.mkDerivation ({ 
    eval "$postInstall"

  '';

  preferLocalBuild = true;

  allowSubstitutes = false;

} // args)

pkgs/build-support/substitute/substitute-all.nix

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({ 
  builder = ./substitute-all.sh;

  inherit (args) src;

  preferLocalBuild = true;

  allowSubstitutes = false;

} // args)

pkgs/development/libraries/fontconfig/make-fonts-cache.nix

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ runCommand "fc-cache" 
  rec {

    buildInputs = [ fontconfig.bin ];

    preferLocalBuild = true;

    allowSubstitutes = false;

    passAsFile = [ "fontDirs" ];

    fontDirs = ''

      <!-- Font directories -->