diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-01-26 23:44:27 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-01-26 23:50:25 +0100 |
| commit | 5e163ba00969e7ba05897840a1199b967252b4ae (patch) | |
| tree | 18923f40bf94a38eaa85a8900690e4bcbfbf7d54 /gnu/packages/gnupg.scm | |
| parent | 4d8837c196cd98cdc1aec17a59b5c2aa90d0e261 (diff) | |
| download | guix-patches-5e163ba00969e7ba05897840a1199b967252b4ae.tar guix-patches-5e163ba00969e7ba05897840a1199b967252b4ae.tar.gz | |
gnu: guile-gcrypt: Add libgcrypt to 'native-inputs'.
* gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Remove.
[native-inputs]: Add LIBGCRYPT.
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a2da166bb4..4793618156 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org> @@ -433,26 +433,13 @@ gpgpme starting with version 1.7.") "0m29fg4pdfifnqqsa437zc5c1bhbfh62mc69ba25ak4x2cla41ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (arguments - ;; When cross-compiling, the bash script libgcrypt-config provided by - ;; libgcrypt must be accessible during configure phase. - `(,@(if (%current-target-system) - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'add-libgrypt-config - (lambda _ - (setenv "PATH" (string-append - (assoc-ref %build-inputs "libgcrypt") - "/bin:" - (getenv "PATH"))) - #t)))) - '()))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) ("automake" ,automake) ("texinfo" ,texinfo) - ("guile" ,guile-3.0))) + ("guile" ,guile-3.0) + ("libgcrypt" ,libgcrypt))) ;for 'libgcrypt-config' (inputs `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt))) |