aboutsummaryrefslogtreecommitdiff
path: root/src/libcmd/installables.hh
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-04 07:50:55 +0100
committereldritch horrors <pennae@lix.systems>2024-03-04 07:50:55 +0100
commit180984178dc4e063607f6e9e94eb2fdfedbfe452 (patch)
tree073cde58b67bbc9b6e2c1ecade8ee14f508f24be /src/libcmd/installables.hh
parentaaf1ed1a4cf0ca53f5324932fe13769cb2b69f74 (diff)
Merge pull request #9648 from cole-h/nix-shell-ordering
nix shell: reflect command line order in PATH order (cherry picked from commit b91c935c2faf08ced2c763dcd2a831f26d84fa86) Change-Id: If16c120bb74857c2817366e74e5b0877eb997260
Diffstat (limited to 'src/libcmd/installables.hh')
-rw-r--r--src/libcmd/installables.hh9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
index b0dc0dc02..ad5b4f759 100644
--- a/src/libcmd/installables.hh
+++ b/src/libcmd/installables.hh
@@ -166,7 +166,14 @@ struct Installable
const Installables & installables,
BuildMode bMode = bmNormal);
- static std::set<StorePath> toStorePaths(
+ static std::set<StorePath> toStorePathSet(
+ ref<Store> evalStore,
+ ref<Store> store,
+ Realise mode,
+ OperateOn operateOn,
+ const Installables & installables);
+
+ static std::vector<StorePath> toStorePaths(
ref<Store> evalStore,
ref<Store> store,
Realise mode,