From 90948a4e3a64492b7d117d93657221fa7b598e6e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 24 Nov 2017 18:07:29 +0100 Subject: nix-shell/nix-build: Support .drv files again Fixes #1663. Also handle '!' (#1694). --- src/nix-build/nix-build.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/nix-build/nix-build.cc') diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index 21b0a18dd..58366daa6 100755 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -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 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) { -- cgit v1.2.3