diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-27 16:58:15 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-27 16:58:15 -0400 |
commit | 1aba0bf0fa831ffee628ae50730eade5b19a544f (patch) | |
tree | 802eb8026a8357d87123a73fc49282381b5fd734 /src/nix-env | |
parent | 42f5a2fc297f841d982f07062c653b27557a3cd5 (diff) | |
download | guix-1aba0bf0fa831ffee628ae50730eade5b19a544f.tar.gz |
nix-store -r: do substitutions in parallel
I.e. when multiple non-derivation arguments are passed to ‘nix-store -r’ to be substituted, do them in parallel.
Diffstat (limited to 'src/nix-env')
-rw-r--r-- | src/nix-env/nix-env.cc | 2 | ||||
-rw-r--r-- | src/nix-env/user-env.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index a8d9076cfb..7aa6276e3a 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -695,7 +695,7 @@ static void opSet(Globals & globals, PathSet paths = singleton<PathSet>(drv.queryDrvPath(globals.state)); printMissing(*store, paths); if (globals.dryRun) return; - store->buildDerivations(paths); + store->buildPaths(paths); } else { printMissing(*store, singleton<PathSet>(drv.queryOutPath(globals.state))); diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 4480a17aa9..510c5ca381 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -45,7 +45,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, drvsToBuild.insert(i->queryDrvPath(state)); debug(format("building user environment dependencies")); - store->buildDerivations(drvsToBuild); + store->buildPaths(drvsToBuild); /* Construct the whole top level derivation. */ PathSet references; @@ -132,7 +132,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, /* Realise the resulting store expression. */ debug("building user environment"); - store->buildDerivations(singleton<PathSet>(topLevelDrv.queryDrvPath(state))); + store->buildPaths(singleton<PathSet>(topLevelDrv.queryDrvPath(state))); /* Switch the current user environment to the output path. */ PathLocks lock; |