ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-gcrypt: Refer to the right libgcrypt when cross-compiling.

Browse source 
Fixes a regression introduced in
5e163ba009 where (gcrypt package-config)
would end up referring to the native libgcrypt.so instead of the target
one.

* gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Reintroduce
'add-libgrypt-config' phase.
[native-inputs]: Remove LIBGCRYPT.
This commit is contained in:
Ludovic Courtès 2021-01-27 11:51:43 +01:00
parent a04b0e454c
commit c45a821a63
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/gnupg.scm
View file

@ -436,14 +436,24 @@ (define-public guile-gcrypt
(arguments
;; Work around <https://bugs.gnu.org/20272> to achieve reproducible
;; builds.
'(#:parallel-build? #f))
'(#:parallel-build? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'add-libgrypt-config
(lambda* (#:key inputs target #:allow-other-keys)
(when target
;; When cross-compiling, the bash script 'libgcrypt-config'
;; must be accessible during the configure phase.
(setenv "PATH"
(string-append (assoc-ref inputs "libgcrypt")
"/bin:" (getenv "PATH")))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
("guile" ,guile-3.0)
("libgcrypt" ,libgcrypt))) ;for 'libgcrypt-config'
("guile" ,guile-3.0)))
(inputs
`(("guile" ,guile-3.0)
("libgcrypt" ,libgcrypt)))