[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: libosinfo: Include operating systems list.

From: guix-commits
Subject: 03/03: gnu: libosinfo: Include operating systems list.
Date: Tue, 18 Feb 2020 02:22:19 -0500 (EST)

niedzejkob pushed a commit to branch master
in repository guix.

commit da6f9aceb4851fb475dbbdcbf9ded73c9230d3de
Author: Brice Waegeneire <address@hidden>
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 <address@hidden>
 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)))))
      `(("libsoup" ,libsoup)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
-       ("gobject-introspection" ,gobject-introspection)))
+       ("osinfo-db" ,osinfo-db)))
      `(("glib" ,glib "bin")  ; glib-mkenums, etc.
+       ("gobject-introspection" ,gobject-introspection)
        ("gtk-doc" ,gtk-doc)
        ("vala" ,vala)
        ("intltool" ,intltool)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]