From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WMgnDR7xVGGfNwAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 01:05:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uFfnCB7xVGFTKwAA1q6Kng (envelope-from ) for ; Wed, 29 Sep 2021 23:05:02 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C525A3575D for ; Thu, 30 Sep 2021 01:05:01 +0200 (CEST) Received: from localhost ([::1]:52324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0L-0004h7-0E for larch@yhetil.org; Wed, 29 Sep 2021 18:24:45 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632956701; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; b=TDE5Vpr05WG/kSr2r2Nx6B5x5TJttwxRUbQbzqXn+IhKChNDF3YtuGkMSOUUBpAtqIzVHo oWDQFV4aEJkrvngTjOFW/ljywV8aBMqbtY1nf8ESWo37/wEa1KW5IGhhVhst9D0Tkk9xTZ D7Kkdqg6OkDJFyV1+6HKp5wmRuOEYSZ6xalxFC9qrwFHQjShUX5wBbFEIjW4dyEGpW8+RK GcYvSgY5nFywnLdshmDWeIe8ZvStYfwmhxUsg5JkTfJRi1nZaC7kXysJwR8FqUGmG0dhsY mG6F0glfPzZVMjfe2rL6mpcn1MhW2oZeYdL97fAz/d7ZFPDp+z55t+cqHINblA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632956701; a=rsa-sha256; cv=none; b=bi3TgrEENWrAiP3wCeGrDg4+UfaXQac9fgyGz7ZL2rvxZ06mGscYTjRSf8H9VgSY89gPL/ eUOfaZ9gOkZSXZVgvpTkpwyTWaZZU+FdfJ3x6FiI7lvNMzGqysbov4WuacZuXG3zQfalfk +NmjvwO2bTGjxnAFjcwEVBjFhQgTsQIthLXLZHfoZMvZ3vKUR9hh4ffxCphGSjF4xycnaW CC5Ti6Z+nXyEen47pNteFVHT18IebpcaZILYpJRON9i65CpVtGpCHGtMBA5dYC5+Us0sGa m/zw4TA7SOs6P5kQ7ijIM1a+a10AiTVQlJdluj3FlObWPhzOm/BpvJJl+h2+6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=pk9fNVal; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=pk9fNVal; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C525A3575D X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: MUJ9GJiwvWpe * 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 -- 2.33.0