Author: eelco
Date: Thu Apr 26 15:17:43 2012
New Revision: 33935
URL: https://nixos.org/websvn/nix/?rev=33935&sc=1
Log:
* Set preferLocalBuild on a few more trivial builders.
Modified:
nixpkgs/trunk/pkgs/build-support/buildenv/default.nix
nixpkgs/trunk/pkgs/build-support/substitute/substitute-all.nix
Modified: nixpkgs/trunk/pkgs/build-support/buildenv/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/buildenv/default.nix Thu Apr 26
15:01:41 2012 (r33934)
+++ nixpkgs/trunk/pkgs/build-support/buildenv/default.nix Thu Apr 26
15:17:43 2012 (r33935)
@@ -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"
Modified: nixpkgs/trunk/pkgs/build-support/substitute/substitute-all.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/substitute/substitute-all.nix Thu Apr
26 15:01:41 2012 (r33934)
+++ nixpkgs/trunk/pkgs/build-support/substitute/substitute-all.nix Thu Apr
26 15:17:43 2012 (r33935)
@@ -1,4 +1,4 @@
-{stdenv}:
+{ stdenv }:
args:
@@ -6,4 +6,5 @@
name = if args ? name then args.name else baseNameOf (toString args.src);
builder = ./substitute-all.sh;
inherit (args) src;
+ preferLocalBuild = true;
} // args)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
