[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/15: gnu: libnma: Update inputs.
From: |
guix-commits |
Subject: |
07/15: gnu: libnma: Update inputs. |
Date: |
Fri, 22 May 2020 17:08:13 -0400 (EDT) |
bricewge pushed a commit to branch master
in repository guix.
commit c25ca6b79ea73a71eacbfa28a21ebdc5433e3c2a
Author: Brice Waegeneire <address@hidden>
AuthorDate: Mon May 11 16:30:55 2020 +0200
gnu: libnma: Update inputs.
* gnu/packages/gnome.scm (libnam)[arguments]: Remove 'glib-or-gtk?' and
add phase 'patch-docbook-xml'.
[native-inputs]: Add 'docboock-xml-4.3' and 'vala'.
[inputs]: Remove 'adwaita'icon-theme'.
squash! gnu: libnma: Update inputs and licenses.
---
gnu/packages/gnome.scm | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f9756e4..3394c1e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -820,16 +820,26 @@ client devices can handle.")
"09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "libnma-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gcr" ,gcr)
+ `(("gcr" ,gcr)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
@@ -838,11 +848,10 @@ client devices can handle.")
(description "Libnma is an applet library for Network Manager. It was
initially part of network-manager-applet and has now become a separate
project.")
- (home-page "https://gitlab.gnome.org/GNOME/libnma")
-
- ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
- ;; "LGPL-2.1+".
- (license license:gpl2+)))
+ (home-page "https://gitlab.gnome.org/GNOME/libnma")
+ ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
+ ;; "LGPL-2.1+".
+ (license license:gpl2+)))
(define-public gnome-menus
(package
- branch master updated (9af90aa -> 46cf343), guix-commits, 2020/05/22
- 03/15: gnu: network-manager: Switch to meson-build-system., guix-commits, 2020/05/22
- 01/15: gnu: network-manager: Update to 1.24.0., guix-commits, 2020/05/22
- 02/15: gnu: network-manager: Add iwd support., guix-commits, 2020/05/22
- 05/15: gnu: modem-manager: Update to 1.12.10., guix-commits, 2020/05/22
- 04/15: gnu: network-manager: Appease guix lint., guix-commits, 2020/05/22
- 06/15: gnu: libnma: Update to 1.8.28., guix-commits, 2020/05/22
- 07/15: gnu: libnma: Update inputs.,
guix-commits <=
- 08/15: gnu: libnma: Adjust indentation., guix-commits, 2020/05/22
- 09/15: gnu: network-manager-openvpn: Update to 1.8.12., guix-commits, 2020/05/22
- 13/15: gnu: network-manager-applet: Appease guix lint., guix-commits, 2020/05/22
- 14/15: gnu: gnome-initial-setup: Use 'libnma'., guix-commits, 2020/05/22
- 11/15: gnu: network-manager-vpnc: Use 'libnma'., guix-commits, 2020/05/22
- 12/15: gnu: network-manager-applet: Update to 1.16.0., guix-commits, 2020/05/22
- 15/15: gnu: gnome-control-center: Use 'libnma'., guix-commits, 2020/05/22
- 10/15: gnu: network-manager-openconnect: Use libnma., guix-commits, 2020/05/22