amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-xyz: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/guile-xyz.scm
(artanis)[inputs]: Add 'bash-minimal'.
(guile-hall)[inputs]: Likewise.
(python-on-guile)[inputs]: Likewise.
(haunt)[inputs]: Likewise.
(emacsy)[inputs]: Likewise.
(nomad)[inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I496c2ac6d7e9a9266dc57cdbc9ada434968d9bac
This commit is contained in:
Maxime Devos 2021-07-02 12:06:36 +02:00 • committed by Ludovic Courtès
parent 261c7692e4
commit 04edfcf7de
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/guile-xyz.scm
View file

@ -187,7 +187,7 @@
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list guile-3.0 nspr nss)) (list bash-minimal guile-3.0 nspr nss))
;; FIXME the bundled csv contains one more exported procedure ;; FIXME the bundled csv contains one more exported procedure
;; (sxml->csv-string) than guile-csv. The author is maintainer of both ;; (sxml->csv-string) than guile-csv. The author is maintainer of both
;; projects. ;; projects.
@ -3051,14 +3051,13 @@ inspired by the SCSH regular expression system.")
(string-append dep "/lib/guile/" (string-append dep "/lib/guile/"
version version
"/site-ccache")) "/site-ccache"))
deps)))) deps)))))))))))))
#t)))))))))
(native-inputs (native-inputs
(list pkg-config texinfo)) (list pkg-config texinfo))
(inputs (inputs
;; Depend on the latest Guile to avoid bytecode compatibility issues when ;; Depend on the latest Guile to avoid bytecode compatibility issues when
;; using modules built against the latest version. ;; using modules built against the latest version.
(list guile-3.0-latest)) (list bash-minimal guile-3.0-latest))
(propagated-inputs (propagated-inputs
(list guile-reader guile-commonmark)) (list guile-reader guile-commonmark))
(synopsis "Functional static site generator") (synopsis "Functional static site generator")
@ -3459,8 +3458,7 @@ serializing continuations or delimited continuations.")
;; TODO: It would be better to patch the Makefile. ;; TODO: It would be better to patch the Makefile.
(setenv "GUILE_LOAD_PATH" (setenv "GUILE_LOAD_PATH"
(string-append ".:" (string-append ".:"
(getenv "GUILE_LOAD_PATH"))) (getenv "GUILE_LOAD_PATH")))))
#t))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Wrap the 'python' executable so it can find its ;; Wrap the 'python' executable so it can find its
@ -3485,10 +3483,9 @@ serializing continuations or delimited continuations.")
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
(,load-path)) (,load-path))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix `("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,compiled-path))) (,compiled-path)))))))))
#t))))))
(inputs (inputs
(list guile-3.0 guile-persist guile-readline guile-stis-parser)) (list bash-minimal guile-3.0 guile-persist guile-readline guile-stis-parser))
(native-inputs (native-inputs
(list autoconf automake libtool pkg-config)) (list autoconf automake libtool pkg-config))
(synopsis "Python implementation in Guile") (synopsis "Python implementation in Guile")
@ -4120,7 +4117,8 @@ applied to surplus arguments.")
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("texlive" ,(texlive-updmap.cfg (list texlive-epsf))))) ("texlive" ,(texlive-updmap.cfg (list texlive-epsf)))))
(inputs (inputs
(list dbus-glib (list bash-minimal
dbus-glib
guile-3.0 guile-3.0
guile-lib guile-lib
guile-readline guile-readline
@ -4330,7 +4328,8 @@ processing filters.")
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("perl" ,perl))) ("perl" ,perl)))
(inputs (inputs
`(;; Guile `(("bash" ,bash-minimal) ; for wrap-program
;; Guile
("guile" ,guile-2.2) ("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib) ("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline) ("guile-readline" ,guile2.2-readline)