nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

* Finished refactoring the tree.

Browse source
This commit is contained in:
Eelco Dolstra 2003-10-20 10:05:01 +00:00
parent 53e376d836
commit c62433751d
10 changed files with 86 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/fix/fix.cc
View file

@ -249,7 +249,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
/* Platform constant. */
if (ATmatch(e, "Platform")) {
return ATmake("<str>", SYSTEM);
return ATmake("<str>", thisSystem.c_str());
}
/* Fix inclusion. */
@ -284,7 +284,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
/* Evaluate the bindings and put them in a map. */
map<string, ATerm> bndMap;
bndMap["platform"] = ATmake("<str>", SYSTEM);
bndMap["platform"] = ATmake("<str>", thisSystem.c_str());
while (!ATisEmpty(bnds)) {
ATerm bnd = ATgetFirst(bnds);
if (!ATmatch(bnd, "(<str>, <term>)", &s1, &e1))
@ -297,7 +297,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
expression. */
NixExpr ne;
ne.type = NixExpr::neDerivation;
ne.derivation.platform = SYSTEM;
ne.derivation.platform = thisSystem;
string name;
Path outPath;
Hash outHash;
@ -320,7 +320,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
ne.derivation.args.push_back(processBinding(state, arg, ne));
args = ATgetNext(args);
}
}
}
else {
string s = processBinding(state, value, ne);