Archived
1
0
Fork 0

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.
This commit is contained in:
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

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,28 +728,21 @@ 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
;; to build.
(let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417")
(revision "4"))
(package (package
(name "dino") (name "dino")
(version (git-version "0.0" revision commit)) (version "0.1.0")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method url-fetch)
(url "https://github.com/dino/dino.git") (uri (string-append "https://github.com/dino/dino/releases/download/v"
(commit commit))) version "/dino-" version ".tar.gz"))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m")))) "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f
#:parallel-build? #f ; not supported #:parallel-build? #f ; not supported
; Use our libsignal-protocol-c instead of the git submodule.
#:configure-flags '("-DSHARED_SIGNAL_PROTOCOL=yes")
#:modules ((guix build cmake-build-system) #:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils)) (guix build utils))
@ -758,14 +751,6 @@ on Axolotl and PEP.")
(guix build glib-or-gtk-build-system)) (guix build glib-or-gtk-build-system))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; The signal-protocol plugin accesses internal headers of
;; libsignal-protocol-c, so we need to put the sources there.
(add-after 'unpack 'unpack-sources
(lambda* (#:key inputs #:allow-other-keys)
(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 (add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs (inputs
@ -781,7 +766,6 @@ on Axolotl and PEP.")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c))
("glib" ,glib "bin") ("glib" ,glib "bin")
("vala" ,vala) ("vala" ,vala)
("gettext" ,gettext-minimal))) ("gettext" ,gettext-minimal)))
@ -789,7 +773,7 @@ on Axolotl and PEP.")
(synopsis "Graphical Jabber (XMPP) client") (synopsis "Graphical Jabber (XMPP) client")
(description "Dino is a Jabber (XMPP) client which aims to fit well into (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