* Compatibility hack so that Nixpkgs can continue to do hash checking

  in `fetchurl' in Nix <= 0.7, but doesn't in Nix 0.8.

2 files changed, 10 insertions, 1 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 2dd8caf15a..1ba521eb37 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -989,6 +989,15 @@ void DerivationGoal::startBuilder()
     /* Also set TMPDIR and variants to point to this directory. */
     env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmpDir;
 
+    /* Compatibility hack with Nix <= 0.7: if this is a fixed-output
+       derivation, tell the builder, so that for instance `fetchurl'
+       can skip checking the output.  On older Nixes, this environment
+       variable won't be set, so `fetchurl' will do the check. */
+    for (DerivationOutputs::iterator i = drv.outputs.begin(); 
+         i != drv.outputs.end(); ++i)
+        if (i->second.hash != "")
+            env["NIX_OUTPUT_CHECKED"] = "1";
+
     /* Run the builder. */
     printMsg(lvlChatty, format("executing builder `%1%'") %
         drv.builder);
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 545df0638d..6e590ba06f 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -209,7 +209,7 @@ static void printDrvTree(const Path & drvPath,
          i != drv.inputDrvs.end(); ++i)
         inputs.insert(i->first);
 
-    /* Topologically sorted under the relation A < B iff A \in
+    /* Topologically sort under the relation A < B iff A \in
        closure(B).  That is, if derivation A is an (possibly indirect)
        input of B, then A is printed first.  This has the effect of
        flattening the tree, preventing deeply nested structures.  */