From: Brice Waegeneire <brice@waegenei.re>
To: 39579@debbugs.gnu.org
Subject: [bug#39579] [PATCH v2 3/3] gnu: libosinfo: Include operating systems list.
Date: Sun, 16 Feb 2020 21:47:12 +0100 [thread overview]
Message-ID: <20200216204712.16592-4-brice@waegenei.re> (raw)
In-Reply-To: <20200212163046.15761-1-brice@waegenei.re>
* gnu/packages/virtualization.scm (libosinfo)[inputs]: Add osinfo-db and
remove gobject-introspection.
[native-inputs]: Add gobject-introspection.
[arguments]: Add phase patch.
squash! gnu: virt-manager: Include operating systems list.
---
gnu/packages/virtualization.scm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 308cadbe14..c34f742655 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -328,14 +328,24 @@ server and embedded PowerPC, and S390 guests.")
(list (string-append "-Dwith-usb-ids-path="
(assoc-ref %build-inputs "usb.ids"))
(string-append "-Dwith-pci-ids-path="
- (assoc-ref %build-inputs "pci.ids")))))
+ (assoc-ref %build-inputs "pci.ids")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-osinfo-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "osinfo/osinfo_loader.c"
+ (("path = DATA_DIR.*")
+ (string-append "path = \"" (assoc-ref inputs "osinfo-db")
+ "/share/osinfo\";")))
+ #t)))))
(inputs
`(("libsoup" ,libsoup)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
- ("gobject-introspection" ,gobject-introspection)))
+ ("osinfo-db" ,osinfo-db)))
(native-inputs
`(("glib" ,glib "bin") ; glib-mkenums, etc.
+ ("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("vala" ,vala)
("intltool" ,intltool)
--
2.25.0
next prev parent reply other threads:[~2020-02-16 20:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 16:30 [bug#39579] [PATCH 0/3] Include operating systems list in virt-manager Brice Waegeneire
2020-02-12 16:37 ` [bug#39579] [PATCH 1/3] gnu: osinfo-db-tools: Add osinfo-db-tools Brice Waegeneire
2020-02-16 19:10 ` Jakub Kądziołka
2020-02-16 19:56 ` Jakub Kądziołka
2020-02-12 16:37 ` [bug#39579] [PATCH 2/3] gnu: osinfo-db: Add osinfo-db Brice Waegeneire
2020-02-16 19:13 ` Jakub Kądziołka
2020-02-12 16:37 ` [bug#39579] [PATCH 3/3] gnu: virt-manager: Include operating systems list Brice Waegeneire
2020-02-16 19:27 ` Jakub Kądziołka
2020-02-16 20:47 ` [bug#39579] [PATCH v2 0/3] Include operating systems list in virt-manager Brice Waegeneire
2020-02-16 20:47 ` [bug#39579] [PATCH v2 1/3] gnu: osinfo-db-tools: Add osinfo-db-tools Brice Waegeneire
2020-02-16 20:47 ` [bug#39579] [PATCH v2 2/3] gnu: osinfo-db: Add osinfo-db Brice Waegeneire
2020-02-16 20:47 ` Brice Waegeneire [this message]
2020-02-19 22:06 ` bug#39579: Done: Include operating systems list in virt-manager Jakub Kądziołka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200216204712.16592-4-brice@waegenei.re \
--to=brice@waegenei.re \
--cc=39579@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).