diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-02-09T12·41+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-02-09T12·41+0000 |
| commit | d0eda1f3e9b2030e373038fd8997f033f2d7aedd (patch) | |
| tree | 9db733f87fceaba36ddcba54b794b8be06c1d136 /corepkgs | |
| parent | 3854fc9b42d16b810f62b64194b699033b03aaf1 (diff) | |
| parent | 543988572e2abc85767da315b2acc1f971c5d07f (diff) | |
* Merged the SQLite branch.
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/buildenv/default.nix | 4 | ||||
| -rw-r--r-- | corepkgs/nar/nar.sh.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/corepkgs/buildenv/default.nix b/corepkgs/buildenv/default.nix index 36dd9d0c6a0a..d76f5274099a 100644 --- a/corepkgs/buildenv/default.nix +++ b/corepkgs/buildenv/default.nix @@ -11,4 +11,8 @@ derivation { paths = derivations; active = map (x: if x ? meta && x.meta ? active then x.meta.active else "true") derivations; priority = map (x: if x ? meta && x.meta ? priority then x.meta.priority else "5") derivations; + + # Building user environments remotely just causes huge amounts of + # network traffic, so don't do that. + preferLocalBuild = true; } diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in index 67933ac67f0b..1369d3a21fb2 100644 --- a/corepkgs/nar/nar.sh.in +++ b/corepkgs/nar/nar.sh.in @@ -7,8 +7,6 @@ dst=$out/tmp.nar.bz2 @bzip2@ < tmp > $dst -@bindir@/nix-hash -vvvvv --flat --type $hashAlgo --base32 tmp > $out/nar-hash - @bindir@/nix-hash --flat --type $hashAlgo --base32 $dst > $out/narbz2-hash @coreutils@/mv $out/tmp.nar.bz2 $out/$(@coreutils@/cat $out/narbz2-hash).nar.bz2 |