From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3Qpg-000894-Ka for guix-patches@gnu.org; Sun, 16 Feb 2020 15:48:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3Qpf-0008BN-O1 for guix-patches@gnu.org; Sun, 16 Feb 2020 15:48:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3Qpf-0008BD-Kd for guix-patches@gnu.org; Sun, 16 Feb 2020 15:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j3Qpf-00078r-JK for guix-patches@gnu.org; Sun, 16 Feb 2020 15:48:03 -0500 Subject: [bug#39579] [PATCH v2 3/3] gnu: libosinfo: Include operating systems list. Resent-Message-ID: From: Brice Waegeneire Date: Sun, 16 Feb 2020 21:47:12 +0100 Message-Id: <20200216204712.16592-4-brice@waegenei.re> In-Reply-To: <20200212163046.15761-1-brice@waegenei.re> References: <20200212163046.15761-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39579@debbugs.gnu.org * 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