aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Waegeneire <brice@waegenei.re>2020-02-16 21:47:12 +0100
committerJakub Kądziołka <kuba@kadziolka.net>2020-02-18 08:22:12 +0100
commitda6f9aceb4851fb475dbbdcbf9ded73c9230d3de (patch)
treeb700fda49394fa97fd28e99e0bbc6e227c62ee6b
parenta838fa282c626116308dd2d1b0012d7df6f044a0 (diff)
downloadpatches-da6f9aceb4851fb475dbbdcbf9ded73c9230d3de.tar
patches-da6f9aceb4851fb475dbbdcbf9ded73c9230d3de.tar.gz
gnu: libosinfo: Include operating systems list.
* 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. Signed-off-by: Jakub Kądziołka <kuba@kadziolka.net>
-rw-r--r--gnu/packages/virtualization.scm14
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 11bf38144d..d3f474d17a 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -329,14 +329,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)