public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Set preferLocalBuild on a few trivial top-level derivations. These

Browse Source 
tend to cause a lot of unnecessary I/O to the build machines.

svn path=/nixos/trunk/; revision=33936
This commit is contained in:
Eelco Dolstra 2012-04-26 15:19:23 +00:00
parent 836fa3b6ae
commit 03f2847054
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/system/activation/top-level.nix
View File

@ -147,6 +147,7 @@ let
# and makes it bootable. # and makes it bootable.
system = pkgs.stdenv.mkDerivation { system = pkgs.stdenv.mkDerivation {
name = "nixos-${config.system.nixosVersion}"; name = "nixos-${config.system.nixosVersion}";
preferLocalBuild = true;
buildCommand = systemBuilder; buildCommand = systemBuilder;
inherit children; inherit children;
kernelParams = kernelParams =

2
modules/system/upstart/upstart.nix
View File

@ -135,7 +135,7 @@ let
in in
pkgs.runCommand ("upstart-" + job.name + ".conf") pkgs.runCommand ("upstart-" + job.name + ".conf")
{ inherit (job) buildHook; inherit jobText; } { inherit (job) buildHook; inherit jobText; preferLocalBuild = true; }
'' ''
eval "$buildHook" eval "$buildHook"
echo "$jobText" > $out echo "$jobText" > $out

3
modules/virtualisation/qemu-vm.nix
View File

@ -184,6 +184,7 @@ let
{ exportReferencesGraph = { exportReferencesGraph =
map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB; map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
buildInputs = [ pkgs.perl ]; buildInputs = [ pkgs.perl ];
preferLocalBuild = true;
} }
'' ''
printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
@ -353,7 +354,7 @@ in
# Don't run ntpd in the guest. It should get the correct time from KVM. # Don't run ntpd in the guest. It should get the correct time from KVM.
services.ntp.enable = false; services.ntp.enable = false;
system.build.vm = pkgs.runCommand "nixos-vm" {} system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
'' ''
ensureDir $out/bin ensureDir $out/bin
ln -s ${config.system.build.toplevel} $out/system ln -s ${config.system.build.toplevel} $out/system