From a1da0fb20b99ba80bd58dd5b2ab08d61f3e8f9c8 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 12 Apr 2020 03:00:26 +0530 Subject: 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. --- gnu/packages/messaging.scm | 108 +++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 62 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 04287f251f..c6217a95de 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire -;;; Copyright © 2017, 2018 Arun Isaac +;;; Copyright © 2017, 2018, 2020 Arun Isaac ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2018, 2019 Rutger Helling @@ -728,68 +728,52 @@ on Axolotl and PEP.") (license license:gpl3+))) (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 - (name "dino") - (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 (git-file-name name version)) - (sha256 - (base32 - "0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; there are no tests - #: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) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build cmake-build-system) - (guix build glib-or-gtk-build-system)) - #: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 - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (inputs - `(("libgee" ,libgee) - ("libsignal-protocol-c" ,libsignal-protocol-c) - ("libgcrypt" ,libgcrypt) - ("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 + (package + (name "dino") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/dino/dino/releases/download/v" + version "/dino-" version ".tar.gz")) + (sha256 + (base32 + "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f + #:parallel-build? #f ; not supported + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build cmake-build-system) + (guix build glib-or-gtk-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (inputs + `(("libgee" ,libgee) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libgcrypt" ,libgcrypt) + ("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) + ("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.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public prosody (package -- cgit v1.2.3