diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-07-30 21:36:18 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-30 21:36:18 +0200 |
| commit | c91171627b5e8351c1b0251cc64ddfea2d952869 (patch) | |
| tree | 8b83405721a928e5c0d2cf7577fa18049f4f2914 /gnu/packages/package-management.scm | |
| parent | 1c0ee79d4dc74f1001644dbb610075dc95dcf102 (diff) | |
| download | guix-c91171627b5e8351c1b0251cc64ddfea2d952869.tar guix-c91171627b5e8351c1b0251cc64ddfea2d952869.tar.gz | |
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'.
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 835c0b291b..5c0e5a9c7d 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) |