summaryrefslogtreecommitdiff
path: root/gnu/packages/messaging.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-01-25 13:00:57 +0100
committerRicardo Wurmus <rekado@elephly.net>2019-01-25 13:21:20 +0100
commitb11af07a29a4a642ff8defc335f11c954da4ca26 (patch)
tree5f61cdb7644392fc76a015bf76ad1b9953de119b /gnu/packages/messaging.scm
parente6a24cd08bb1ef3376f709aee9e3a22a51482868 (diff)
downloadguix-patches-b11af07a29a4a642ff8defc335f11c954da4ca26.tar
guix-patches-b11af07a29a4a642ff8defc335f11c954da4ca26.tar.gz
gnu: dino: Update to 0.0-4.8e14ac6.
* gnu/packages/messaging.scm (dino): Update to 0.0-4.8e14ac6. [arguments]: Use INVOKE in build phases. [inputs]: Add qrencode; replace sqlite with sqlite-with-column-metadata.
Diffstat (limited to 'gnu/packages/messaging.scm')
-rw-r--r--gnu/packages/messaging.scm27
1 files changed, 12 insertions, 15 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 7736945fa9..2a8813cfcf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
@@ -718,20 +718,20 @@ on Axolotl and PEP.")
(define-public dino
;; The only release tarball is for version 0.0, but it is very old and fails
;; to build.
- (let ((commit "f25fadde2d6c9492b9cafe2cddbcc7b966942e47")
- (revision "3"))
+ (let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417")
+ (revision "4"))
(package
(name "dino")
- (version (string-append "0.0-" revision "." (string-take commit 9)))
+ (version (git-version "0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dino/dino.git")
(commit commit)))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1nhzrw3pbpybn9qclckk6z427vbgnqd0y1l63zd1rfw4zw099mzs"))))
+ "0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
@@ -750,14 +750,10 @@ on Axolotl and PEP.")
;; libsignal-protocol-c, so we need to put the sources there.
(add-after 'unpack 'unpack-sources
(lambda* (#:key inputs #:allow-other-keys)
- (let ((unpack (lambda (source target)
- (with-directory-excursion target
- (zero? (system* "tar" "xvf"
- (assoc-ref inputs source)
- "--strip-components=1"))))))
- (unpack "libsignal-protocol-c-source"
- "plugins/signal-protocol/libsignal-protocol-c")
- #t)))
+ (with-directory-excursion "plugins/signal-protocol/libsignal-protocol-c"
+ (invoke "tar" "xvf"
+ (assoc-ref inputs "libsignal-protocol-c-source")
+ "--strip-components=1"))))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
@@ -765,7 +761,8 @@ on Axolotl and PEP.")
("libsignal-protocol-c" ,libsignal-protocol-c)
("libgcrypt" ,libgcrypt)
("libsoup" ,libsoup)
- ("sqlite" ,sqlite)
+ ("qrencode" ,qrencode)
+ ("sqlite" ,sqlite-with-column-metadata)
("gpgme" ,gpgme)
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)