diff mbox series

[bug#40657] gnu: liblinphone: Fix icons. (v2)

Message ID 20200420015036.70389578.raghavgururajan@disroot.org
State Accepted
Headers show
Series [bug#40657] gnu: liblinphone: Fix icons. (v2) | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Raghav Gururajan April 20, 2020, 5:50 a.m. UTC

Comments

Maxim Cournoyer April 21, 2020, 2:03 a.m. UTC | #1 
Hello Raghav,

Raghav Gururajan <raghavgururajan@disroot.org> writes:

>>From f9dcbb7c2756f960721cf7194b710de3c4ac22e1 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Mon, 20 Apr 2020 01:47:50 -0400
> Subject: [PATCH] gnu: liblinphone: Fix icons.
>
> * gnu/packages/linphone.scm (liblinphone): Fix icons.
> ---
>  gnu/packages/linphone.scm | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index c9959d7d01..8962f2001e 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -49,6 +49,7 @@
>    #:use-module (guix packages)
>    #:use-module (guix download)
>    #:use-module (guix build-system cmake)
> +  #:use-module (guix build-system glib-or-gtk)
>    #:use-module (guix build-system gnu))
>  
>  (define-public bcunit
> @@ -428,8 +429,17 @@ decoding, and rendering.")
>                                        "/lib/glib-2.0/include"))
>          "-DENABLE_STATIC=NO"            ; Not required
>          "-DENABLE_GTK_UI=YES")          ; For Legacy UI
> +       #: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 glib-or-gtk:)
> +                  (guix build utils))
>         #:phases
>         (modify-phases %standard-phases
> +         (add-after 'install 'glib-or-gtk-compile-schemas
> +           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
> +         (add-after 'install 'glib-or-gtk-wrap
> +           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
>           (add-after 'unpack 'patch
>             (lambda _
>               (substitute* "gtk/main.c"
> @@ -449,6 +459,7 @@ decoding, and rendering.")
>         ("belcard" ,belcard)
>         ("bellesip" ,belle-sip)
>         ("bzrtp", bzrtp)
> +       ("hicolor-icon-theme" ,hicolor-icon-theme) ; Hard-coded for GTK UI
>         ("glib" ,glib)
>         ("gtk2" ,gtk+-2)
>         ("mediastreamer2" ,mediastreamer2)

Tested and pushed as commit 41169f21e6.

Thank you,

Maxim
diff mbox series

Patch

From f9dcbb7c2756f960721cf7194b710de3c4ac22e1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 20 Apr 2020 01:47:50 -0400
Subject: [PATCH] gnu: liblinphone: Fix icons.

* gnu/packages/linphone.scm (liblinphone): Fix icons.
---
 gnu/packages/linphone.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index c9959d7d01..8962f2001e 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -49,6 +49,7 @@ 
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu))
 
 (define-public bcunit
@@ -428,8 +429,17 @@  decoding, and rendering.")
                                       "/lib/glib-2.0/include"))
         "-DENABLE_STATIC=NO"            ; Not required
         "-DENABLE_GTK_UI=YES")          ; For Legacy UI
+       #: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 glib-or-gtk:)
+                  (guix build utils))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'install 'glib-or-gtk-compile-schemas
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+         (add-after 'install 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
          (add-after 'unpack 'patch
            (lambda _
              (substitute* "gtk/main.c"
@@ -449,6 +459,7 @@  decoding, and rendering.")
        ("belcard" ,belcard)
        ("bellesip" ,belle-sip)
        ("bzrtp", bzrtp)
+       ("hicolor-icon-theme" ,hicolor-icon-theme) ; Hard-coded for GTK UI
        ("glib" ,glib)
        ("gtk2" ,gtk+-2)
        ("mediastreamer2" ,mediastreamer2)
-- 
2.26.1