me
/
guix
Archived
1
0
Fork 0
Code

gnu: dino: Update to 0.1.0. 

* gnu/packages/messaging.scm (dino): Update to 0.1.0.
[source]: Replace git repository with release tarball.
[arguments]: Remove "-DSHARED_SIGNAL_PROTOCOL=yes" configure flag. Remove
unpack-sources phase.
[native-inputs]: Remove libsignal-protocol-c-source.
master
Arun Isaac 2020-04-12 03:00:26 +05:30
parent 48e961a5ab
commit a1da0fb20b
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 46 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
gnu/packages/messaging.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
@ -728,68 +728,52 @@ on Axolotl and PEP.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public dino (define-public dino
;; The only release tarball is for version 0.0, but it is very old and fails (package
;; to build. (name "dino")
(let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417") (version "0.1.0")
(revision "4")) (source
(package (origin
(name "dino") (method url-fetch)
(version (git-version "0.0" revision commit)) (uri (string-append "https://github.com/dino/dino/releases/download/v"
(source (origin version "/dino-" version ".tar.gz"))
(method git-fetch) (sha256
(uri (git-reference (base32
(url "https://github.com/dino/dino.git") "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h"))))
(commit commit))) (build-system cmake-build-system)
(file-name (git-file-name name version)) (arguments
(sha256 `(#:tests? #f
(base32 #:parallel-build? #f ; not supported
"0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m")))) #:modules ((guix build cmake-build-system)
(build-system cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(arguments (guix build utils))
`(#:tests? #f ; there are no tests #:imported-modules (,@%gnu-build-system-modules
#:parallel-build? #f ; not supported (guix build cmake-build-system)
; Use our libsignal-protocol-c instead of the git submodule. (guix build glib-or-gtk-build-system))
#:configure-flags '("-DSHARED_SIGNAL_PROTOCOL=yes") #:phases
#:modules ((guix build cmake-build-system) (modify-phases %standard-phases
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (add-after 'install 'glib-or-gtk-wrap
(guix build utils)) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
#:imported-modules (,@%gnu-build-system-modules (inputs
(guix build cmake-build-system) `(("libgee" ,libgee)
(guix build glib-or-gtk-build-system)) ("libsignal-protocol-c" ,libsignal-protocol-c)
#:phases ("libgcrypt" ,libgcrypt)
(modify-phases %standard-phases ("libsoup" ,libsoup)
;; The signal-protocol plugin accesses internal headers of ("qrencode" ,qrencode)
;; libsignal-protocol-c, so we need to put the sources there. ("sqlite" ,sqlite-with-column-metadata)
(add-after 'unpack 'unpack-sources ("gpgme" ,gpgme)
(lambda* (#:key inputs #:allow-other-keys) ("gtk+" ,gtk+)
(with-directory-excursion "plugins/signal-protocol/libsignal-protocol-c" ("glib-networking" ,glib-networking)
(invoke "tar" "xvf" ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(assoc-ref inputs "libsignal-protocol-c-source") (native-inputs
"--strip-components=1")))) `(("pkg-config" ,pkg-config)
(add-after 'install 'glib-or-gtk-wrap ("glib" ,glib "bin")
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) ("vala" ,vala)
(inputs ("gettext" ,gettext-minimal)))
`(("libgee" ,libgee) (home-page "https://dino.im")
("libsignal-protocol-c" ,libsignal-protocol-c) (synopsis "Graphical Jabber (XMPP) client")
("libgcrypt" ,libgcrypt) (description "Dino is a Jabber (XMPP) client which aims to fit well into
("libsoup" ,libsoup)
("qrencode" ,qrencode)
("sqlite" ,sqlite-with-column-metadata)
("gpgme" ,gpgme)
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(native-inputs
`(("pkg-config" ,pkg-config)
("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c))
("glib" ,glib "bin")
("vala" ,vala)
("gettext" ,gettext-minimal)))
(home-page "https://dino.im")
(synopsis "Graphical Jabber (XMPP) client")
(description "Dino is a Jabber (XMPP) client which aims to fit well into
a graphical desktop environment like GNOME.") a graphical desktop environment like GNOME.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public prosody (define-public prosody
(package (package