diff options
| author | Andreas Enge <andreas@enge.fr> | 2013-12-18 14:11:01 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2013-12-18 14:11:01 +0100 |
| commit | a53421fddab7c15f851e6a9cf0d14bb87cbbea28 (patch) | |
| tree | 08e103749e0a468fdeeaffb640731ab54a39ae5d | |
| parent | d44da8b09244f51a1a7d5a4cbc81e04ca42e0e1f (diff) | |
gnu: libgcrypt: Make old version 1.5.3 public.
* gnu/packages/gnupg.scm (libgcrypt-1.5): New variable.
* gnu/packages/ssh.scm (libssh): Use libgcrypt-1.5 instead of defining it
ad-hoc.
| -rw-r--r-- | gnu/packages/gnupg.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/ssh.scm | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index fb7b4975ac..2472610dfb 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -91,6 +91,18 @@ algorithms, public key algorithms, large integer functions and random number generation.") (license lgpl2.0+))) +(define-public libgcrypt-1.5 + (package (inherit libgcrypt) + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" + version ".tar.bz2")) + (sha256 + (base32 + "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw")))))) + (define-public libassuan (package (name "libassuan") diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index f8352ac9cd..2197388902 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -80,21 +80,10 @@ lib)))) %standard-phases))) (inputs `(("zlib" ,zlib) - ("libgcrypt" ;; Link against an older gcrypt, because libssh tries to access ;; fields of 'gcry_thread_cbs' that are now private: ;; src/threads.c:72:26: error: 'struct gcry_thread_cbs' has no member named 'mutex_init' - ,(package (inherit libgcrypt) - (version "1.5.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://gnupg/libgcrypt/libgcrypt-" - version ".tar.bz2")) - (sha256 - (base32 - "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw")))))))) + ("libgcrypt", libgcrypt-1.5))) (native-inputs `(("patchelf" ,patchelf))) (synopsis "SSH client library") (description |