From patchwork Sun Feb 16 20:47:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20279 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C33A517B9F; Sun, 16 Feb 2020 20:48:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8EA5217ACF for ; Sun, 16 Feb 2020 20:48:27 +0000 (GMT) Received: from localhost ([::1]:36230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3Qq3-00006G-4T for patchwork@mira.cbaines.net; Sun, 16 Feb 2020 15:48:27 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#39579] [PATCH v2 3/3] gnu: libosinfo: Include operating systems list. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2020 20:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39579 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39579@debbugs.gnu.org Received: via spool by 39579-submit@debbugs.gnu.org id=B39579.158188605527399 (code B ref 39579); Sun, 16 Feb 2020 20:48:03 +0000 Received: (at 39579) by debbugs.gnu.org; 16 Feb 2020 20:47:35 +0000 Received: from localhost ([127.0.0.1]:37753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j3QpD-00077q-3j for submit@debbugs.gnu.org; Sun, 16 Feb 2020 15:47:35 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:58179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j3QpA-00077U-6n for 39579@debbugs.gnu.org; Sun, 16 Feb 2020 15:47:32 -0500 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 472FD60007 for <39579@debbugs.gnu.org>; Sun, 16 Feb 2020 20:47:31 +0000 (UTC) From: Brice Waegeneire Date: Sun, 16 Feb 2020 21:47:12 +0100 Message-Id: <20200216204712.16592-4-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212163046.15761-1-brice@waegenei.re> References: <20200212163046.15761-1-brice@waegenei.re> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)