diff options
| -rw-r--r-- | gnu/packages/gnupg.scm | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 1d25a653d85..0847d006812 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm | |||
| @@ -174,16 +174,13 @@ Daemon and possibly more in the future.") | |||
| 174 | (package | 174 | (package |
| 175 | (name "libgcrypt") | 175 | (name "libgcrypt") |
| 176 | (version "1.12.2") | 176 | (version "1.12.2") |
| 177 | (source | 177 | (source (origin |
| 178 | (origin | 178 | (method url-fetch) |
| 179 | (method git-fetch) | 179 | (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" |
| 180 | (uri (git-reference | 180 | version ".tar.bz2")) |
| 181 | (url "https://github.com/gpg/libgcrypt") | 181 | (sha256 |
| 182 | (commit (string-append "libgcrypt-" version)))) | 182 | (base32 |
| 183 | (file-name (git-file-name name version)) | 183 | "0pmxp91sirqmsiy7asnjbz5ksglzbqhh11baz4v086i2j8j3rqvw")))) |
| 184 | (sha256 | ||
| 185 | (base32 | ||
| 186 | "1mrh5dwzvw63pdl2jvahgd5vacrk684qjzlhimm58gj68shndssh")))) | ||
| 187 | (build-system gnu-build-system) | 184 | (build-system gnu-build-system) |
| 188 | (arguments | 185 | (arguments |
| 189 | ;; The '--with-gpg-error-prefix' argument is needed because otherwise | 186 | ;; The '--with-gpg-error-prefix' argument is needed because otherwise |
| @@ -192,7 +189,6 @@ Daemon and possibly more in the future.") | |||
| 192 | (list | 189 | (list |
| 193 | #:configure-flags | 190 | #:configure-flags |
| 194 | #~(append | 191 | #~(append |
| 195 | (list "--enable-maintainer-mode") ;see README.GIT | ||
| 196 | (let ((gpgrt-config (search-input-file #$(if (%current-target-system) | 192 | (let ((gpgrt-config (search-input-file #$(if (%current-target-system) |
| 197 | #~%build-target-inputs | 193 | #~%build-target-inputs |
| 198 | #~%build-inputs) | 194 | #~%build-inputs) |
| @@ -205,10 +201,6 @@ Daemon and possibly more in the future.") | |||
| 205 | ;; not respected. See <https://dev.gnupg.org/T5365>. | 201 | ;; not respected. See <https://dev.gnupg.org/T5365>. |
| 206 | ;; TODO: transition to pkg-config instead of these scripts. | 202 | ;; TODO: transition to pkg-config instead of these scripts. |
| 207 | (string-append "ac_cv_path_GPGRT_CONFIG=" gpgrt-config))) | 203 | (string-append "ac_cv_path_GPGRT_CONFIG=" gpgrt-config))) |
| 208 | |||
| 209 | ;; TODO: There is a dependency cycle with fig2dev; remove when | ||
| 210 | ;; fixed. | ||
| 211 | (list "--disable-doc") | ||
| 212 | #$@(if (%current-target-system) | 204 | #$@(if (%current-target-system) |
| 213 | ;; When cross-compiling, _gcry_mpih_lshift etc are | 205 | ;; When cross-compiling, _gcry_mpih_lshift etc are |
| 214 | ;; undefined. | 206 | ;; undefined. |
| @@ -223,8 +215,6 @@ Daemon and possibly more in the future.") | |||
| 223 | (else #~()))))) | 215 | (else #~()))))) |
| 224 | (outputs '("out" "debug")) | 216 | (outputs '("out" "debug")) |
| 225 | (propagated-inputs (list libgpg-error)) | 217 | (propagated-inputs (list libgpg-error)) |
| 226 | (native-inputs | ||
| 227 | (list autoconf automake)) | ||
| 228 | (home-page "https://gnupg.org/software/libgcrypt") | 218 | (home-page "https://gnupg.org/software/libgcrypt") |
| 229 | (synopsis "Cryptographic function library") | 219 | (synopsis "Cryptographic function library") |
| 230 | (description | 220 | (description |
