aboutsummaryrefslogtreecommitdiff
path: root/src/nix/bundle.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-05 18:47:33 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-05 18:47:33 -0400
commit1b6cf0d5f56e166a1cbbf38142375b7a92fc88f2 (patch)
tree58c49f0887f613f0a149b639b5d7ded47062b1cf /src/nix/bundle.cc
parentd5cef6c33a051dfc672cb1e5f4739948b167315b (diff)
parent4bf3eb27e6e2c0cdac862d188b23342793180999 (diff)
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/nix/bundle.cc')
-rw-r--r--src/nix/bundle.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc
index e86fbb3f7..53dccc63a 100644
--- a/src/nix/bundle.cc
+++ b/src/nix/bundle.cc
@@ -70,7 +70,7 @@ struct CmdBundle : InstallableCommand
auto evalState = getEvalState();
auto app = installable->toApp(*evalState);
- store->buildPaths(toBuildableReqs(app.context));
+ store->buildPaths(toDerivedPaths(app.context));
auto [bundlerFlakeRef, bundlerName] = parseFlakeRefWithFragment(bundler, absPath("."));
const flake::LockFlags lockFlags{ .writeLockFile = false };
@@ -110,7 +110,7 @@ struct CmdBundle : InstallableCommand
StorePath outPath = store->parseStorePath(evalState->coerceToPath(*attr2->pos, *attr2->value, context2));
- store->buildPaths({ BuildableReqFromDrv { drvPath } });
+ store->buildPaths({ DerivedPath::Built { drvPath } });
auto outPathS = store->printStorePath(outPath);