From patchwork Wed Sep 29 22:19:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33454 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 6BC9527BBE3; Wed, 29 Sep 2021 23:24:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTPS id 2C75727BBE1 for ; Wed, 29 Sep 2021 23:24:45 +0100 (BST) Received: from localhost ([::1]:52324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0K-0004h7-8R for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwp-0006jy-5F for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwo-00022y-Re for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwo-0000jm-Na for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540292522 (code B ref 50905); Wed, 29 Sep 2021 22:21:06 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:29 +0000 Received: from localhost ([127.0.0.1]:50669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwD-0000eW-3X for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:29 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvb-0000ZT-Um for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:56 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKrRd; Thu, 30 Sep 2021 00:19:51 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:18 +0200 Message-Id: <20210929221938.17168-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953991; bh=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pk9fNValHzJx+yFzuKATNWdRlWcyxMJqqcx7mVFUBuiwLKjZx5K0WmjPqz5dxv9Bl 9nw8vLrejtPzpyzRHPoN+mFXOeMkX2tdYAOGvVWquYloTWbWhRa5vxoC4mi10U32N5 ewEjWqUc4gUnYwbYs8I1G1n14UpPpHLB7nppoHL/7tN24ECHvnRzPmTwyyIXLHMrck 0O/egni1WOHeF87tL60ojzB5iTbWsCHvVwIfBIK8hvsfp4UieV/v/nqM2pf4tYdiCM /rMwYn4RA8Ka7k1IIvfA8hTDqMdu6YiQXGf3OWi7BOOHJrYUr0sdO2xl7pKj3x5cAA 0HxCUuv6bE0xQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xsl and docbook-xml. --- gnu/packages/gtk.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4f8b87ea48..fd7feab69b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -623,23 +623,17 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/"))) (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")))) #t)) (add-before 'configure 'disable-failing-tests