summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-12-17 22:01:42 +0100
committerLudovic Courtès <ludo@gnu.org>2013-12-17 22:01:42 +0100
commit678110b94978dfb68a49d1976b60f74831c61415 (patch)
tree3607f3c21d78a9a9a1093ffc07b83fec8281471a
parentf22e0e264e400b69fc91509c676f9069b7cdbc2e (diff)
downloadguix-678110b94978dfb68a49d1976b60f74831c61415.tar.gz
gnu: libssh: Build against an older libgcrypt.
* gnu/packages/ssh.scm (libssh): Use libgcrypt 1.5.3 as an input.
-rw-r--r--gnu/packages/ssh.scm16
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 76d51c44c6..52ce7a3aba 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -80,7 +80,21 @@
                                       lib))))
                  %standard-phases)))
     (inputs `(("zlib" ,zlib)
-              ("libgcrypt" ,libgcrypt)))
+              ("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"))))))))
     (native-inputs `(("patchelf" ,patchelf)))
     (synopsis "SSH client library")
     (description