aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-shell: Don't absolutize '-p' expressions

Browse source 
This prevents spurious syscalls like

  25011 lstat("/home/eelco/with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) \"shell\" { buildInputs = [ (hello) ]; } \"\"", 0x7ffe9c67f580) = -1 ENOENT (No such file or directory)
This commit is contained in:
Eelco Dolstra 2019-05-08 14:18:57 +02:00
parent 5713772568
commit 7c6391ddc7
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix-build/nix-build.cc
View file

@ -274,13 +274,14 @@ static void _main(int argc, char * * argv)
exprs = {state->parseStdin()}; exprs = {state->parseStdin()};
else else
for (auto i : left) { for (auto i : left) {
if (fromArgs)
exprs.push_back(state->parseExprFromString(i, absPath(".")));
else {
auto absolute = i; auto absolute = i;
try { try {
absolute = canonPath(absPath(i), true); absolute = canonPath(absPath(i), true);
} catch (Error e) {}; } catch (Error e) {};
if (fromArgs) if (store->isStorePath(absolute) && std::regex_match(absolute, std::regex(".*\\.drv(!.*)?")))
exprs.push_back(state->parseExprFromString(i, absPath(".")));
else if (store->isStorePath(absolute) && std::regex_match(absolute, std::regex(".*\\.drv(!.*)?")))
drvs.push_back(DrvInfo(*state, store, absolute)); drvs.push_back(DrvInfo(*state, store, absolute));
else else
/* If we're in a #! script, interpret filenames /* If we're in a #! script, interpret filenames
@ -288,6 +289,7 @@ static void _main(int argc, char * * argv)
exprs.push_back(state->parseExprFromFile(resolveExprPath(state->checkSourcePath(lookupFileArg(*state, exprs.push_back(state->parseExprFromFile(resolveExprPath(state->checkSourcePath(lookupFileArg(*state,
inShebang && !packages ? absPath(i, absPath(dirOf(script))) : i))))); inShebang && !packages ? absPath(i, absPath(dirOf(script))) : i)))));
} }
}
/* Evaluate them into derivations. */ /* Evaluate them into derivations. */
if (attrPaths.empty()) attrPaths = {""}; if (attrPaths.empty()) attrPaths = {""};