From: Jean Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: "56252@debbugs.gnu.org" <56252@debbugs.gnu.org>
Subject: [bug#56252] Fw: Re: [PATCH] gnu: polkit-mozjs: Fix native-inputs usage.
Date: Mon, 27 Jun 2022 21:32:49 +0000 [thread overview]
Message-ID: <Q0Y3IK7kQZOJM4gJF9WX07NzpvpPbjjwEOClNLNNfXjyXyCC9nf64e_FIP6S8DQAbvxZC1o6Dl7k1IV5UJlDcUu_aR71yhU2WW9IXg5OQ1w=@jeandudey.tech> (raw)
In-Reply-To: <Tzbu_Cst3asDQ5T7OvnHl-6fRLezyI_8nm2a6oAwjQzQA3Mo20YZR2pMmR2ojpMdXIU44r9sWMU9eydXNswqRfDMabtzC11kHJGvcDSg1Cs=@jeandudey.tech>
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
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 <liliana.prikler@ist.tugraz.at> 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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-polkit-mozjs-Fix-native-inputs-on-stage.patch --]
[-- Type: text/x-patch; name=0001-gnu-polkit-mozjs-Fix-native-inputs-on-stage.patch, Size: 2048 bytes --]
From 7a6b55bb34a61ab393b5a994dc1467f5f25a2992 Mon Sep 17 00:00:00 2001
Message-Id: <7a6b55bb34a61ab393b5a994dc1467f5f25a2992.1656347660.git.me@jeandudey.tech>
From: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
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 <rekado@elephly.net>
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;;
;;; 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
next prev parent reply other threads:[~2022-06-27 21:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-27 10:34 [bug#56252] [PATCH] gnu: polkit-mozjs: Fix native-inputs usage Jean Pierre De Jesus DIAZ via Guix-patches via
2022-06-27 12:19 ` Liliana Marie Prikler
[not found] ` <Tzbu_Cst3asDQ5T7OvnHl-6fRLezyI_8nm2a6oAwjQzQA3Mo20YZR2pMmR2ojpMdXIU44r9sWMU9eydXNswqRfDMabtzC11kHJGvcDSg1Cs=@jeandudey.tech>
2022-06-27 21:32 ` Jean Pierre De Jesus DIAZ via Guix-patches via [this message]
2022-07-20 13:12 ` bug#56252: Fw: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='Q0Y3IK7kQZOJM4gJF9WX07NzpvpPbjjwEOClNLNNfXjyXyCC9nf64e_FIP6S8DQAbvxZC1o6Dl7k1IV5UJlDcUu_aR71yhU2WW9IXg5OQ1w=@jeandudey.tech' \
--to=guix-patches@gnu.org \
--cc=56252@debbugs.gnu.org \
--cc=me@jeandudey.tech \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).