guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: jami-gnome: Include phases from the glib-or-


From: guix-commits
Subject: branch master updated: gnu: jami-gnome: Include phases from the glib-or-gtk-build-system.
Date: Fri, 28 May 2021 10:11:11 -0400

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4ec964e  gnu: jami-gnome: Include phases from the 
glib-or-gtk-build-system.
4ec964e is described below

commit 4ec964ec38d511ca203cd3c29b194d0cfb99667a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri May 28 08:06:45 2021 -0400

    gnu: jami-gnome: Include phases from the glib-or-gtk-build-system.
    
    This makes Jami less dependent on the environment it is run within; for
    example when using Jami on a foreign distributions.
    
    * gnu/packages/jami.scm (jami-gnome)[imported-modules]: New argument.
    [modules]: New argument.
    [phases]{glib-or-gtk-compile-schemas, glib-or-gtk-wrap}: New phases.
    
    Reported-by: Simon Tournier <zimon.toutoune@gmail.com>
---
 gnu/packages/jami.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 0adc3ed..ff14373 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -546,12 +546,21 @@ decentralized calling using P2P-DHT.")
                             ; automatically started by DBus.
        ("adwaita-icon-theme" ,adwaita-icon-theme)))
     (arguments
-     `(#:tests? #f                      ; There is no testsuite.
+     `(#:tests? #f                      ;no test suite
+       #:imported-modules (,@%cmake-build-system-modules
+                           (guix build glib-or-gtk-build-system))
+       #:modules ((guix build cmake-build-system)
+                  ((guix build glib-or-gtk-build-system) #:prefix gtk:)
+                  (guix build utils))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'change-directory
            (lambda _
-             (chdir "client-gnome"))))))
+             (chdir "client-gnome")))
+         (add-after 'install 'glib-or-gtk-compile-schemas
+           (assoc-ref gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+         (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+           (assoc-ref gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (synopsis "Jami client for GNOME")
     (description "This package provides a Jami client for the GNOME desktop.
 Jami is a secure and distributed voice, video and chat communication platform



reply via email to

[Prev in Thread] Current Thread [Next in Thread]