02/02: gnu: guix: Search .go files of dependencies in lib/guile/.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit c91171627b5e8351c1b0251cc64ddfea2d952869
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jul 30 21:36:18 2017 +0200

    gnu: guix: Search .go files of dependencies in lib/guile/.
    
    * gnu/packages/package-management.scm (guix)[arguments]: Add (srfi
    srfi-26) to #:modules.  Introduce 'gopath', distinct from 'path'.
---
 gnu/packages/package-management.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 835c0b2..5c0e5a9 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -121,6 +121,7 @@
 
          #:modules ((guix build gnu-build-system)
                     (guix build utils)
+                    (srfi srfi-26)
                     (ice-9 popen)
                     (ice-9 rdelim))
 
@@ -190,20 +191,28 @@
                                (git    (assoc-ref inputs "guile-git"))
                                (ssh    (assoc-ref inputs "guile-ssh"))
                                (gnutls (assoc-ref inputs "gnutls"))
+                               (deps   (list json gnutls git ssh))
                                (effective
                                 (read-line
                                  (open-pipe* OPEN_READ
                                              (string-append guile "/bin/guile")
                                              "-c" "(display 
(effective-version))")))
-                               (path   (string-append
-                                        json "/share/guile/site/" effective ":"
-                                        git "/share/guile/site/" effective ":"
-                                        ssh "/share/guile/site/" effective ":"
-                                        gnutls "/share/guile/site/" 
effective)))
+                               (path   (string-join
+                                        (map (cut string-append <>
+                                                  "/share/guile/site/"
+                                                  effective)
+                                             deps)
+                                        ":"))
+                               (gopath (string-join
+                                        (map (cut string-append <>
+                                                  "/lib/guile/" effective
+                                                  "/site-ccache")
+                                             deps)
+                                        ":")))
 
                           (wrap-program (string-append out "/bin/guix")
                             `("GUILE_LOAD_PATH" ":" prefix (,path))
-                            `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path)))
+                            `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))
 
                           #t))))))
       (native-inputs `(("pkg-config" ,pkg-config)