wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

nix-shell/nix-build: Support .drv files again

Browse source 
Fixes #1663.

Also handle '!<output-name>' (#1694).
This commit is contained in:
Eelco Dolstra 2017-11-24 18:07:29 +01:00
parent 0fc3e581e0
commit 90948a4e3a
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 61 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -263,6 +263,8 @@ void mainWrapped(int argc, char * * argv)
if (runEnv)
setenv("IN_NIX_SHELL", pure ? "pure" : "impure", 1);
DrvInfos drvs;
/* Parse the expressions. */
std::vector<Expr *> exprs;
@ -272,6 +274,8 @@ void mainWrapped(int argc, char * * argv)
for (auto i : left) {
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 we're in a #! script, interpret filenames
relative to the script. */
@ -280,8 +284,6 @@ void mainWrapped(int argc, char * * argv)
}
/* Evaluate them into derivations. */
DrvInfos drvs;
if (attrPaths.empty()) attrPaths = {""};
for (auto e : exprs) {