aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorregnat <rg@regnat.ovh>2021-02-25 16:58:27 +0100
committerregnat <rg@regnat.ovh>2021-02-25 17:21:51 +0100
commitc43f446f4e3a1a8d91560b6ebbcc7d4fbbbf71c4 (patch)
treed571191108a3b1dff780fb8cf5a84bd5037e12b3 /src/libstore
parentc182aac98ab6548c16b6686638591ba5b034026a (diff)
Make `nix copy` work without the ca-derivations flag
The experimental feature was by mistake required for `nix copy` to work at oll
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/store-api.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index b7a3f7b11..77c310988 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -786,13 +786,14 @@ void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStore, const RealisedPath::Set & paths,
RepairFlag repair, CheckSigsFlag checkSigs, SubstituteFlag substitute)
{
- settings.requireExperimentalFeature("ca-derivations");
StorePathSet storePaths;
std::set<Realisation> realisations;
for (auto & path : paths) {
storePaths.insert(path.path());
- if (auto realisation = std::get_if<Realisation>(&path.raw))
+ if (auto realisation = std::get_if<Realisation>(&path.raw)) {
+ settings.requireExperimentalFeature("ca-derivations");
realisations.insert(*realisation);
+ }
}
auto pathsMap = copyPaths(srcStore, dstStore, storePaths, repair, checkSigs, substitute);
try {