From 5e4422d81d4fd5581bce8f8b29f4c75864e37bd0 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 19 Apr 2018 16:18:26 -0400
Subject: [PATCH 1/3] DRAFT: build: Load $(GNU_SYSTEM_MODULES) before
 guix/{import,scripts}.

This works around an issue where modules in guix/import and guix/scripts
sometimes depend on package definitions at module load time.

* Makefile.am (MODULES): Move $(GNU_SYSTEM_MODULES) above guix/import/* and
guix/scripts/*.
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 86528e8fd..c6dca942f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,6 +174,7 @@ MODULES =					\
   guix/build/make-bootstrap.scm			\
   guix/search-paths.scm				\
   guix/packages.scm				\
+  $(GNU_SYSTEM_MODULES)				\
   guix/import/print.scm				\
   guix/import/utils.scm				\
   guix/import/gnu.scm				\
@@ -214,8 +215,7 @@ MODULES =					\
   guix/scripts/graph.scm			\
   guix/scripts/container.scm			\
   guix/scripts/container/exec.scm		\
-  guix.scm					\
-  $(GNU_SYSTEM_MODULES)
+  guix.scm
 
 if HAVE_GUILE_JSON
 
-- 
2.17.0