From patchwork Mon Jun 27 21:32:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean Pierre De Jesus DIAZ X-Patchwork-Id: 40360 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 398A927BBEA; Mon, 27 Jun 2022 22:34:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B8AFA27BBE9 for ; Mon, 27 Jun 2022 22:34:11 +0100 (BST) Received: from localhost ([::1]:37536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5wN0-0003lH-S3 for patchwork@mira.cbaines.net; Mon, 27 Jun 2022 17:34:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5wMs-0003l0-N2 for guix-patches@gnu.org; Mon, 27 Jun 2022 17:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5wMs-0006Kn-Ex for guix-patches@gnu.org; Mon, 27 Jun 2022 17:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o5wMs-0007C4-CT for guix-patches@gnu.org; Mon, 27 Jun 2022 17:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56252] Fw: Re: [PATCH] gnu: polkit-mozjs: Fix native-inputs usage. Resent-From: Jean Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Jun 2022 21:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56252 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56252@debbugs.gnu.org" <56252@debbugs.gnu.org> Received: via spool by 56252-submit@debbugs.gnu.org id=B56252.165636558827595 (code B ref 56252); Mon, 27 Jun 2022 21:34:02 +0000 Received: (at 56252) by debbugs.gnu.org; 27 Jun 2022 21:33:08 +0000 Received: from localhost ([127.0.0.1]:53487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5wM0-0007B0-8y for submit@debbugs.gnu.org; Mon, 27 Jun 2022 17:33:08 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:55592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5wLw-0007AT-Pe for 56252@debbugs.gnu.org; Mon, 27 Jun 2022 17:33:07 -0400 Date: Mon, 27 Jun 2022 21:32:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeandudey.tech; s=protonmail3; t=1656365577; x=1656624777; bh=eZZRHlWgfExmVfFictby4jVQwR8w4jZ6enuXVQ2KohQ=; h=Date:To:From:Reply-To:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=dwxUpBI+FXqLf/Wo0Q6SG1J6TFY6eqjUA8YjkuYXGsrhmVyLtGTtAnywLBijtOpsr +kfPR5E1LBEmk+Vdi++C5dqDv+q3vUyatjnGDTDeACTiBd+o7RPWPKbqyR77tNkOkk 96lpZimUhfrqTjQj+iNnlmpNNzpWAgFXsY8OUivF4zCrEmqEsXxeEtB3DmhjDx7hKf BdStPGwSFO3a2DhIUpZSpAgWXoGN7Fz57vhJwIU/SmwOPdKAjMkcG6fgyq88VgNfXg LmWU6o6tTuOYyK+r6Y09XJlvWK773v/7n2Z7c3UyvcuSIACzSTtxFJSbtaRlW1nMnb DgWX1/PC5bz+Q== Message-ID: In-Reply-To: References: Feedback-ID: 20187791:user:proton MIME-Version: 1.0 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" Reply-to: Jean Pierre De Jesus DIAZ X-ACL-Warn: , Jean Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean Pierre De Jesus DIAZ via Guix-patches via From: Jean Pierre De Jesus DIAZ X-getmail-retrieved-from-mailbox: Patches Fixed it and changed commit message. Thanks! — Jean-Pierre De Jesus DIAZ ------- Original Message ------- On Monday, June 27th, 2022 at 2:19 PM, Liliana Marie Prikler wrote: > Am Montag, dem 27.06.2022 um 10:34 +0000 schrieb Jean Pierre De Jesus > DIAZ: > > > - (lambda* (#:key inputs #:allow-other-keys) > > - (let ((xsldoc (string-append (assoc-ref inputs > > "docbook-xsl") > > + (lambda* (#:key native-inputs #:allow-other-keys) > > + (let ((xsldoc (string-append (assoc-ref native-inputs > > "docbook-xsl") > > The correct usage would be (or native-inputs inputs). > > Cheers From 7a6b55bb34a61ab393b5a994dc1467f5f25a2992 Mon Sep 17 00:00:00 2001 Message-Id: <7a6b55bb34a61ab393b5a994dc1467f5f25a2992.1656347660.git.me@jeandudey.tech> From: Jean-Pierre De Jesus DIAZ Date: Mon, 27 Jun 2022 12:18:05 +0200 Subject: [PATCH] gnu: polkit-mozjs: Fix native-inputs on stage. * gnu/packages/polkit.scm (polkit-duktape)[arguments]: Change the use of `inputs' to `(or native-inputs inputs)' when searching for `docbook-xsl' path. --- gnu/packages/polkit.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index a75608cd43..9a3703b196 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; ;;; This file is part of GNU Guix. ;;; @@ -119,10 +120,11 @@ (define-public polkit-mozjs (("@INTROSPECTION_TYPELIBDIR@") (string-append out "/lib/girepository-1.0/")))))) (add-after 'unpack 'fix-manpage-generation - (lambda* (#:key inputs #:allow-other-keys) - (let ((xsldoc (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((xsldoc (string-append + (assoc-ref (or native-inputs inputs) "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) (substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in") (("http://docbook.sourceforge.net/release/xsl/current") xsldoc))))) -- 2.36.1