From 6c9838ad54727574bb0faa62fc46a1e0fcced9ba Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 25 Jun 2013 11:03:47 +0300
Subject: [PATCH] Rename repeatableStdenv to deterministicStdenv for
 consistency. Make it plug more holes to avoid regular binutils sneaking in
 and ruining builds.

---
 pkgs/top-level/all-packages.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25b5db6f872..b9018dc568c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2844,7 +2844,14 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  repeatableStdenv  = lowPrio (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh );
+  deterministicStdenv = lowPrio (
+    overrideInStdenv (
+      stdenvAdapters.overrideGCC
+        (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh )
+      gcc46_deterministic
+    )
+    [ binutils_deterministic ]
+  );
 
   roadsend = callPackage ../development/compilers/roadsend { };