aboutsummaryrefslogtreecommitdiff
path: root/src/nix-build
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-04 17:26:32 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-10-04 17:26:32 +0200
commita323b7826c1104a6404c5fdfd4a824a0d5598618 (patch)
tree9ff2d0abe60218b5be032db8352d22628c1d0eca /src/nix-build
parent21e2088c1b6f5458f31fd368f416d45e4eb2bc5f (diff)
parent93b1ce1ac522ff92626da5cdd689008063935844 (diff)
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/nix-build')
-rwxr-xr-xsrc/nix-build/nix-build.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 605802f72..53a564676 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -282,12 +282,12 @@ static void _main(int argc, char * * argv)
absolute = canonPath(absPath(i), true);
} catch (Error & e) {};
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. */
- exprs.push_back(state->parseExprFromFile(resolveExprPath(state->checkSourcePath(lookupFileArg(*state,
- inShebang && !packages ? absPath(i, absPath(dirOf(script))) : i)))));
+ drvs.push_back(DrvInfo(*state, store, absolute));
+ else
+ /* If we're in a #! script, interpret filenames
+ relative to the script. */
+ exprs.push_back(state->parseExprFromFile(resolveExprPath(state->checkSourcePath(lookupFileArg(*state,
+ inShebang && !packages ? absPath(i, absPath(dirOf(script))) : i)))));
}
}