diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2022-03-02 20:37:46 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2022-03-02 20:38:51 +0100 |
commit | 161f798aa13b56c5f71120a8cb5788409d9ab815 (patch) | |
tree | 5c3d00d365962c836ebd43595daa9b08ba0ab11b /src/libcmd | |
parent | 54888b92ded6c242ce4914628553d8b2c9c55d10 (diff) |
nix profile: Support CA derivations
Diffstat (limited to 'src/libcmd')
-rw-r--r-- | src/libcmd/installables.cc | 4 | ||||
-rw-r--r-- | src/libcmd/installables.hh | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index b9afe5105..f18be5287 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -470,7 +470,6 @@ std::vector<InstallableValue::DerivationInfo> InstallableAttrPath::toDerivations for (auto & drvInfo : drvInfos) { res.push_back({ state->store->parseStorePath(drvInfo.queryDrvPath()), - state->store->maybeParseStorePath(drvInfo.queryOutPath()), drvInfo.queryOutputName() }); } @@ -584,9 +583,8 @@ std::tuple<std::string, FlakeRef, InstallableValue::DerivationInfo> InstallableF auto drvPath = attr->forceDerivation(); - auto drvInfo = DerivationInfo{ + auto drvInfo = DerivationInfo { std::move(drvPath), - state->store->maybeParseStorePath(attr->getAttr(state->sOutPath)->getString()), attr->getAttr(state->sOutputName)->getString() }; diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh index f296434c5..e172b71b0 100644 --- a/src/libcmd/installables.hh +++ b/src/libcmd/installables.hh @@ -134,7 +134,6 @@ struct InstallableValue : Installable struct DerivationInfo { StorePath drvPath; - std::optional<StorePath> outPath; std::string outputName; }; |