From b9e9235ac0dcb647f9d2bf81be682ce27ffb113f Mon Sep 17 00:00:00 2001 From: Qyriad Date: Mon, 17 Jun 2024 14:35:42 -0600 Subject: [PATCH] de-inheritance CmdBundle for InstallableValueCommand Change-Id: Icbac4ef927ddcaf0d2a74b376e5a77299529cd34 --- src/nix/bundle.cc | 10 ++++++---- 1 file 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 outLink; @@ -71,11 +71,13 @@ struct CmdBundle : InstallableValueCommand return res; } - void run(ref store, ref installable) override + void run(ref store, ref 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 };