diff options
author | Qyriad <qyriad@qyriad.me> | 2024-06-17 14:35:42 -0600 |
---|---|---|
committer | Qyriad <qyriad@qyriad.me> | 2024-06-20 17:00:06 +0000 |
commit | b9e9235ac0dcb647f9d2bf81be682ce27ffb113f (patch) | |
tree | 490c8198aac6f3bc0b96808a9bec63f5d4594257 | |
parent | 1e5f13456075722c33f3348de61847b1bdf6b60c (diff) |
de-inheritance CmdBundle for InstallableValueCommand
Change-Id: Icbac4ef927ddcaf0d2a74b376e5a77299529cd34
-rw-r--r-- | src/nix/bundle.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc index 504e35c81..8bf158d61 100644 --- a/src/nix/bundle.cc +++ b/src/nix/bundle.cc @@ -1,5 +1,5 @@ #include "installable-flake.hh" -#include "command-installable-value.hh" +#include "command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" @@ -9,7 +9,7 @@ using namespace nix; -struct CmdBundle : InstallableValueCommand +struct CmdBundle : InstallableCommand { std::string bundler = "github:NixOS/bundlers"; std::optional<Path> outLink; @@ -71,11 +71,13 @@ struct CmdBundle : InstallableValueCommand return res; } - void run(ref<Store> store, ref<InstallableValue> installable) override + void run(ref<Store> store, ref<Installable> installable) override { auto evalState = getEvalState(); - auto val = installable->toValue(*evalState).first; + auto const installableValue = InstallableValue::require(installable); + + auto val = installableValue->toValue(*evalState).first; auto [bundlerFlakeRef, bundlerName, extendedOutputsSpec] = parseFlakeRefWithFragmentAndExtendedOutputsSpec(bundler, absPath(".")); const flake::LockFlags lockFlags{ .writeLockFile = false }; |