maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "prim_toPath: Actually make the string a path"

Browse source 
This reverts commit 2980d1fba9.  It
causes a regression in NixOS evaluation:

string `/nix/store/ya3s5gmj3b28170fpbjhgsk8wzymkpa1-pommed-1.39/etc/pommed.conf' cannot refer to other paths
This commit is contained in:
Eelco Dolstra 2012-11-15 23:04:34 +01:00
parent f794465ca8
commit 17dc306aa3
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/primops.cc
View file

@ -517,9 +517,7 @@ static void prim_toPath(EvalState & state, Value * * args, Value & v)
{ {
PathSet context; PathSet context;
Path path = state.coerceToPath(*args[0], context); Path path = state.coerceToPath(*args[0], context);
if (!context.empty()) mkString(v, canonPath(path), context);
throw EvalError(format("string `%1%' cannot refer to other paths") % path);
mkPath(v, canonPath(path).c_str());
} }