diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-26 15:17:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-26 15:17:43 +0000 |
| commit | fa276c45dd0834dff731251c3d4c1fe8bc6a11e0 (patch) | |
| tree | c2721581a9a8805bc1989f2a3db85882d7bf4c2d /pkgs/build-support | |
| parent | e5fc65ed40fa984d87c40399f51f3e96fc78d619 (diff) | |
| download | nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.tar nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.tar.gz nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.tar.bz2 nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.tar.lz nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.tar.xz nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.tar.zst nixlib-fa276c45dd0834dff731251c3d4c1fe8bc6a11e0.zip | |
* Set preferLocalBuild on a few more trivial builders.
svn path=/nixpkgs/trunk/; revision=33935
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/buildenv/default.nix | 4 | ||||
| -rw-r--r-- | 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 1bfada4fb627..63e4481e4e34 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 6c0f970a392a..fb26894661d9 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) |