[PATCH] gnu: fix some issues cross-compiling glib

[John Darrington]

From: John Darrington <address@hidden>

* gnu/packages/glib.scm (glib) : Moved inputs to native-inputs,
  and change "inputs" to "%build-inputs"
---
 gnu/packages/glib.scm |   47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ac1b095..9fe016d 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -133,35 +133,44 @@ shared NFS home directories.")
               "bin"           ; glib-mkenums, gtester, etc.; depends on Python
               "doc"))         ; 20 MiB of GTK-Doc reference
    (inputs
-    `(("coreutils" ,coreutils)
-      ("libffi" ,libffi)
+    `(("libffi" ,libffi)
       ("zlib" ,zlib)
       ("tzdata" ,tzdata)))     ; for tests/gdatetime.c
+
    (native-inputs
     `(("gettext" ,gnu-gettext)
       ("dbus" ,dbus)                              ; for GDBus tests
+      ("coreutils" ,coreutils)
       ("pkg-config" ,pkg-config)
+      ;; The following ought to be achieved by (native-self-input #t).
+      ;; Unfortunately it seems to only set glib:out.  We want glib:bin
+      ,@(if (%current-target-system) 
+            `(("native-glib" ,glib "bin"))
+            '())
       ("python" ,python-wrapper)
       ("perl" ,perl)                              ; needed by GIO tests
       ("bash" ,bash)))
-   (arguments
-    '(#:phases (alist-cons-before
-                'build 'pre-build
-                (lambda* (#:key inputs outputs #:allow-other-keys)
-                  ;; For tests/gdatetime.c.
-                  (setenv "TZDIR"
-                          (string-append (assoc-ref inputs "tzdata")
-                                         "/share/zoneinfo"))
 
-                  ;; Some tests want write access there.
-                  (setenv "XDG_CACHE_HOME" (getcwd))
-
-                  (substitute* '("glib/gspawn.c"
-                                 "glib/tests/utils.c"
-                                 "tests/spawn-test.c")
-                    (("/bin/sh")
-                     (string-append (assoc-ref inputs "bash") "/bin/sh"))))
-                %standard-phases)
+   (arguments
+    `(#:phases 
+       (alist-cons-before
+        'build 'pre-build
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          ;; For tests/gdatetime.c.
+          (setenv "TZDIR"
+                  (string-append (assoc-ref inputs "tzdata")
+                                 "/share/zoneinfo"))
+          
+          ;; Some tests want write access there.
+          (setenv "XDG_CACHE_HOME" (getcwd))
+          
+          (substitute* '("glib/gspawn.c"
+                         "glib/tests/utils.c"
+                         "tests/spawn-test.c")
+            (("/bin/sh")
+             (string-append 
+              (assoc-ref %build-inputs "bash") "/bin/sh"))))
+        %standard-phases)
 
       ;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
       #:configure-flags (list (string-append "--with-html-dir="
-- 
1.7.10.4