From fa276c45dd0834dff731251c3d4c1fe8bc6a11e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Apr 2012 15:17:43 +0000 Subject: [PATCH] * Set preferLocalBuild on a few more trivial builders. svn path=/nixpkgs/trunk/; revision=33935 --- pkgs/build-support/buildenv/default.nix | 4 +++- pkgs/build-support/substitute/substitute-all.nix | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 1bfada4fb62..63e4481e4e3 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -26,7 +26,9 @@ }: runCommand name - { inherit manifest paths ignoreCollisions pathsToLink postBuild; } + { inherit manifest paths ignoreCollisions pathsToLink postBuild; + preferLocalBuild = true; + } '' ${perl}/bin/perl -w ${./builder.pl} eval "$postBuild" diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 6c0f970a392..fb26894661d 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -1,4 +1,4 @@ -{stdenv}: +{ stdenv }: args: @@ -6,4 +6,5 @@ stdenv.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); builder = ./substitute-all.sh; inherit (args) src; + preferLocalBuild = true; } // args)