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
2024-03-04 07:50:55 +01:00
parent aaf1ed1a4c
commit 180984178d
6 changed files with 56 additions and 8 deletions
@@ -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,