mirror of
https://github.com/NixOS/nix
synced 2025-07-07 18:31:49 +02:00
nix-shell: allow symlinks to .drvs
This makes persistent shell environments easier to use.
This commit is contained in:
parent
48662d151b
commit
12913ccf45
3 changed files with 19 additions and 3 deletions
|
@ -271,10 +271,14 @@ void mainWrapped(int argc, char * * argv)
|
|||
exprs = {state.parseStdin()};
|
||||
else
|
||||
for (auto i : left) {
|
||||
auto absolute = i;
|
||||
try {
|
||||
absolute = canonPath(absPath(i), true);
|
||||
} catch (Error e) {};
|
||||
if (fromArgs)
|
||||
exprs.push_back(state.parseExprFromString(i, absPath(".")));
|
||||
else if (store->isStorePath(i) && std::regex_match(i, std::regex(".*\\.drv(!.*)?")))
|
||||
drvs.push_back(DrvInfo(state, store, i));
|
||||
else if (store->isStorePath(absolute) && std::regex_match(absolute, std::regex(".*\\.drv(!.*)?")))
|
||||
drvs.push_back(DrvInfo(state, store, absolute));
|
||||
else
|
||||
/* If we're in a #! script, interpret filenames
|
||||
relative to the script. */
|
||||
|
|
|
@ -70,7 +70,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
|
|||
if (gcRoot == "")
|
||||
printGCWarning();
|
||||
else {
|
||||
Path rootName = gcRoot;
|
||||
Path rootName = indirectRoot ? absPath(gcRoot) : gcRoot;
|
||||
if (++rootNr > 1) rootName += "-" + std::to_string(rootNr);
|
||||
auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>();
|
||||
if (store2)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue