nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2017-07-30 21:36:18 +02:00
parent 1c0ee79d4d
commit c91171627b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/package-management.scm
View File

@ -121,6 +121,7 @@
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(srfi srfi-26)
(ice-9 popen) (ice-9 popen)
(ice-9 rdelim)) (ice-9 rdelim))
@ -190,20 +191,28 @@
(git (assoc-ref inputs "guile-git")) (git (assoc-ref inputs "guile-git"))
(ssh (assoc-ref inputs "guile-ssh")) (ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls")) (gnutls (assoc-ref inputs "gnutls"))
(deps (list json gnutls git ssh))
(effective (effective
(read-line (read-line
(open-pipe* OPEN_READ (open-pipe* OPEN_READ
(string-append guile "/bin/guile") (string-append guile "/bin/guile")
"-c" "(display (effective-version))"))) "-c" "(display (effective-version))")))
(path (string-append (path (string-join
json "/share/guile/site/" effective ":" (map (cut string-append <>
git "/share/guile/site/" effective ":" "/share/guile/site/"
ssh "/share/guile/site/" effective ":" effective)
gnutls "/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") (wrap-program (string-append out "/bin/guix")
`("GUILE_LOAD_PATH" ":" prefix (,path)) `("GUILE_LOAD_PATH" ":" prefix (,path))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))
#t)))))) #t))))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)