diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-08-06T13·02+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-08-06T13·02+0000 |
| commit | 54945a2950174ded83d58336061b4a9990cdbbfd (patch) | |
| tree | 8789c505f73551e9a40d745cbb2858ddc683cd9c /src/libexpr/common-opts.cc | |
| parent | c8606664abe952f74985503c831d31ae7a7369bc (diff) | |
* Refactoring: move parseExprFromFile() and parseExprFromString() into
the EvalState class.
Diffstat (limited to 'src/libexpr/common-opts.cc')
| -rw-r--r-- | src/libexpr/common-opts.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libexpr/common-opts.cc b/src/libexpr/common-opts.cc index c364aa9cb599..bab31f4935db 100644 --- a/src/libexpr/common-opts.cc +++ b/src/libexpr/common-opts.cc @@ -1,7 +1,6 @@ #include "common-opts.hh" #include "../libmain/shared.hh" #include "util.hh" -#include "parser.hh" namespace nix { @@ -25,7 +24,7 @@ bool parseOptionArg(const string & arg, Strings::iterator & i, autoArgs.push_back(Attr(state.symbols.create(name), v)); if (arg == "--arg") - state.mkThunk_(*v, parseExprFromString(state, value, absPath("."))); + state.mkThunk_(*v, state.parseExprFromString(value, absPath("."))); else mkString(*v, value); |