me/guix
Archived
1
0
Fork 0
Code Activity

gnu: dino: Update to 0.0-2-2a514d096.

Browse source 
* gnu/packages/messaging.scm (dino): Update to 0.0-2-2a514d096.
[source]: Do not fetch libsignal-protocol-c submodule.
[arguments]: Add phase "unpack-sources" to unpack our sources for
libsignal-protocol-c.
[native-inputs]: Add "libsignal-protocol-c-source".
This commit is contained in:
Ricardo Wurmus 2017-11-17 23:26:03 +01:00
parent d8e257113c
commit b3b07df403
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/messaging.scm
View file

@ -567,8 +567,8 @@ end-to-end encryption support; XML console.")
(define-public dino (define-public dino
;; The only release tarball is for version 0.0, but it is very old and fails ;; The only release tarball is for version 0.0, but it is very old and fails
;; to build. ;; to build.
(let ((commit "f6ac5bbd26638412a2289fd1d28ef12de1d7e8b5") (let ((commit "2a514d0969f5c25d5e2d14421125a47df6b14974")
(revision "1")) (revision "2"))
(package (package
(name "dino") (name "dino")
(version (string-append "0.0-" revision "." (string-take commit 9))) (version (string-append "0.0-" revision "." (string-take commit 9)))
@ -576,13 +576,11 @@ end-to-end encryption support; XML console.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dino/dino.git") (url "https://github.com/dino/dino.git")
(commit commit) (commit commit)))
(recursive? #t))) ; Needed for the 'libsignal-protocol-c'
; submodule.
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"14vk5jmvn8igjikrvg7pinrzahw8gryysb1v9y3vw47ncyic8b7p")))) "0v9fqikxvamdw7bxbwc4s01x0vf30vl77149y16krijaqnq6kzv0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
@ -597,6 +595,18 @@ end-to-end encryption support; XML console.")
(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)
(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)))
(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
@ -611,6 +621,7 @@ end-to-end encryption support; XML console.")
("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)))