4 files changed, 19 insertions, 12 deletions
diff --git a/src/fix.cc b/src/fix.cc
index 6e3809f828e5..93cc27cfca7c 100644
--- a/src/fix.cc
+++ b/src/fix.cc
@@ -153,8 +153,10 @@ static Expr evalExpr2(EvalState & state, Expr e)
         fs.slice.roots.push_back(id);
         fs.slice.elems.push_back(elem);
 
-        return ATmake("FSId(<str>)", 
-            ((string) writeTerm(unparseFState(fs), "")).c_str());
+        FSId termId = hashString("producer-" + (string) id
+            + "-" + dstPath);
+        writeTerm(unparseFState(fs), "", termId);
+        return ATmake("FSId(<str>)", ((string) termId).c_str());
     }
 
     /* Packages are transformed into Derive fstate expressions. */
@@ -176,6 +178,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
         fs.type = FState::fsDerive;
         fs.derive.platform = SYSTEM;
         string name;
+        FSId outId;
         bnds = ATempty;
 
         for (map<string, ATerm>::iterator it = bndMap.begin();
@@ -195,6 +198,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
             }
             else if (ATmatch(value, "<str>", &s1)) {
                 if (key == "name") name = s1;
+                if (key == "id") outId = parseHash(s1);
                 fs.derive.env.push_back(StringPair(key, s1));
             }
             else throw badTerm("invalid package argument", value);
@@ -211,7 +215,8 @@ static Expr evalExpr2(EvalState & state, Expr e)
         
         /* Hash the fstate-expression with no outputs to produce a
            unique but deterministic path name for this package. */
-        Hash outId = hashTerm(unparseFState(fs));
+        if (outId == FSId())
+            outId = hashTerm(unparseFState(fs));
         string outPath = 
             canonPath(nixStore + "/" + ((string) outId).c_str() + "-" + name);
         fs.derive.env.push_back(StringPair("out", outPath));
@@ -219,8 +224,10 @@ static Expr evalExpr2(EvalState & state, Expr e)
         debug(format("%1%: %2%") % (string) outId % name);
 
         /* Write the resulting term into the Nix store directory. */
-        return ATmake("FSId(<str>)", 
-            ((string) writeTerm(unparseFState(fs), "-d-" + name)).c_str());
+        FSId termId = hashString("producer-" + (string) outId
+            + "-" + outPath);
+        writeTerm(unparseFState(fs), "-d-" + name, termId);
+        return ATmake("FSId(<str>)", ((string) termId).c_str());
     }
 
     /* BaseName primitive function. */
diff --git a/src/fstate.cc b/src/fstate.cc
index 85f8c75cc5bc..1c8c6776f1ed 100644
--- a/src/fstate.cc
+++ b/src/fstate.cc
@@ -31,9 +31,10 @@ ATerm termFromId(const FSId & id)
 }
 
 
-FSId writeTerm(ATerm t, const string & suffix)
+FSId writeTerm(ATerm t, const string & suffix, FSId id)
 {
-    FSId id = hashTerm(t);
+    /* By default, the id of a term is its hash. */
+    if (id == FSId()) id = hashTerm(t);
 
     string path = canonPath(nixStore + "/" + 
         (string) id + suffix + ".nix");
diff --git a/src/fstate.hh b/src/fstate.hh
index 681a8d094180..969abe9e0632 100644
--- a/src/fstate.hh
+++ b/src/fstate.hh
@@ -63,7 +63,7 @@ Hash hashTerm(ATerm t);
 ATerm termFromId(const FSId & id);
 
 /* Write an aterm to the Nix store directory, and return its hash. */
-FSId writeTerm(ATerm t, const string & suffix);
+FSId writeTerm(ATerm t, const string & suffix, FSId id = FSId());
 
 /* Parse an fstate-expression. */
 FState parseFState(ATerm t);
diff --git a/src/normalise.cc b/src/normalise.cc
index fcb9c4d0d34d..d06c8bf3608d 100644
--- a/src/normalise.cc
+++ b/src/normalise.cc
@@ -88,19 +88,18 @@ Slice normaliseFState(FSId id)
 
     /* We can skip running the builder if we can expand all output
        paths from their ids. */
-    bool fastBuild = false;
-#if 0
+    bool fastBuild = true;
     for (OutPaths::iterator i = outPaths.begin(); 
          i != outPaths.end(); i++)
     {
         try {
             expandId(i->second, i->first);
-        } catch (...) {
+        } catch (Error & e) {
+            debug(format("fast build failed: %1%") % e.what());
             fastBuild = false;
             break;
         }
     }
-#endif
 
     if (!fastBuild) {