From f3aa48978e1f0922094f159c762bf8664ae40ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 27 Mar 2013 00:07:46 +0100
Subject: [PATCH] hydra-eval-guile-jobs: Allow use of the installed Guix.

* src/script/hydra-eval-guile-jobs.in: Leave GUILE_LOAD_PATH and
  GUILE_LOAD_COMPILED_PATH unchanged.
---
 src/script/hydra-eval-guile-jobs.in | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/script/hydra-eval-guile-jobs.in b/src/script/hydra-eval-guile-jobs.in
index cefa64fc..2bcaaadc 100644
--- a/src/script/hydra-eval-guile-jobs.in
+++ b/src/script/hydra-eval-guile-jobs.in
@@ -2,11 +2,9 @@
 # Aside from this initial boilerplate, this is actually -*- scheme -*- code.
 main="(module-ref (resolve-interface '(hydra-eval-guile-jobs)) 'eval-guile-jobs)"
 
-# Make sure no undeclared dependency is leaked.  Guix has to be
-# provided as an input through Hydra.  Guix itself must thus be built via a
-# recipe written in the Nix language.
-unset GUILE_LOAD_PATH
-unset GUILE_LOAD_COMPILED_PATH
+# Keep the host's GUILE_LOAD_PATH unchanged to allow the installed Guix to
+# be used.  This moves Guix modules possibly out of control, but solves
+# bootstrapping issues.
 
 exec ${GUILE:-@GUILE@} --no-auto-compile   \
   -l "$0" -c "(apply $main (cdr (command-line)))" "$@"