From c4be15a83b95b882357990488a7c8ccd47feb94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Nov 2017 08:07:15 +0100
Subject: [PATCH] closure-info: another half-blind attempt to fix on Hydra

The previous one was very bad and worsened the situation.
But even running with some nix-1.12 I'm unable to reproduce
the original failure.  Let's unblock channels for now.
---
 pkgs/build-support/closure-info.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index 537cc1fbb75..4d178ac96c5 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -8,7 +8,10 @@
 
 { rootPaths }:
 
-if builtins.langVersion >= 5 then
+#if builtins.langVersion >= 5 then
+# FIXME: it doesn't work on Hydra, failing to find mkdir;
+#   perhaps .attrs.sh clobbers PATH with new nix?
+if false then
 
   # Nix >= 1.12: Include NAR hash / size info.
 
@@ -19,7 +22,7 @@ if builtins.langVersion >= 5 then
 
     exportReferencesGraph.closure = rootPaths;
 
-    nativeBuildInputs = [ jq ];
+    PATH = "${coreutils}/bin:${jq}/bin";
 
     builder = builtins.toFile "builder"
       ''