niedzejkob pushed a commit to branch master in repository guix. commit da6f9aceb4851fb475dbbdcbf9ded73c9230d3de Author: Brice Waegeneire <br...@waegenei.re> AuthorDate: Sun Feb 16 21:47:12 2020 +0100
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 <k...@kadziolka.net> --- 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 11bf381..d3f474d 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)