diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/packages/linphone.scm | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: etc/news.scm gnu/local.mk gnu/packages/bootloaders.scm gnu/packages/linphone.scm gnu/packages/linux.scm gnu/packages/tls.scm gnu/system.scm
Diffstat (limited to 'gnu/packages/linphone.scm')
| -rw-r--r-- | gnu/packages/linphone.scm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index b9d455ab3e..e5eb128c85 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -51,6 +51,7 @@ #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (guix build-system qt) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu)) (define-public bcunit @@ -422,8 +423,17 @@ including media capture, encoding and decoding, and rendering.") "-DENABLE_STATIC=NO" ; Not required "-DENABLE_STRICT=NO" "-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" @@ -443,6 +453,7 @@ including media capture, encoding and 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) |