* [bug#56252] [PATCH] gnu: polkit-mozjs: Fix native-inputs usage.
@ 2022-06-27 10:34 Jean Pierre De Jesus DIAZ via Guix-patches via
2022-06-27 12:19 ` Liliana Marie Prikler
0 siblings, 1 reply; 4+ messages in thread
From: Jean Pierre De Jesus DIAZ via Guix-patches via @ 2022-06-27 10:34 UTC (permalink / raw)
To: 56252
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
This patch fixes cross-compilation for `polkit-mozjs' and `polkit-duktape'.
The error can be seen by executing:
guix build polkit-duktape \
--target=aarch64-linux-gnu
—
Jean-Pierre De Jesus DIAZ
[-- 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: 1780 bytes --]
From ef8d6092de9a134cea73893536eb9ad9615454fe Mon Sep 17 00:00:00 2001
Message-Id: <ef8d6092de9a134cea73893536eb9ad9615454fe.1656325553.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 `native-inputs' when searching for `docbook-xsl' path as
it is a native input.
---
gnu/packages/polkit.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index a75608cd43..8d9b6773c5 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,8 +120,8 @@ (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")
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (let ((xsldoc (string-append (assoc-ref native-inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))))
(substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in")
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 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: 1780 bytes --]
From ef8d6092de9a134cea73893536eb9ad9615454fe Mon Sep 17 00:00:00 2001
Message-Id: <ef8d6092de9a134cea73893536eb9ad9615454fe.1656325553.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 `native-inputs' when searching for `docbook-xsl' path as
it is a native input.
---
gnu/packages/polkit.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index a75608cd43..8d9b6773c5 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,8 +120,8 @@ (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")
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (let ((xsldoc (string-append (assoc-ref native-inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))))
(substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in")
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#56252] [PATCH] gnu: polkit-mozjs: Fix native-inputs usage.
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>
0 siblings, 1 reply; 4+ messages in thread
From: Liliana Marie Prikler @ 2022-06-27 12:19 UTC (permalink / raw)
To: Jean Pierre De Jesus DIAZ, 56252
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#56252] Fw: Re: [PATCH] gnu: polkit-mozjs: Fix native-inputs usage.
[not found] ` <Tzbu_Cst3asDQ5T7OvnHl-6fRLezyI_8nm2a6oAwjQzQA3Mo20YZR2pMmR2ojpMdXIU44r9sWMU9eydXNswqRfDMabtzC11kHJGvcDSg1Cs=@jeandudey.tech>
@ 2022-06-27 21:32 ` Jean Pierre De Jesus DIAZ via Guix-patches via
2022-07-20 13:12 ` bug#56252: " Marius Bakke
0 siblings, 1 reply; 4+ messages in thread
From: Jean Pierre De Jesus DIAZ via Guix-patches via @ 2022-06-27 21:32 UTC (permalink / raw)
To: 56252@debbugs.gnu.org
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#56252: Fw: Re: [PATCH] gnu: polkit-mozjs: Fix native-inputs usage.
2022-06-27 21:32 ` [bug#56252] Fw: " Jean Pierre De Jesus DIAZ via Guix-patches via
@ 2022-07-20 13:12 ` Marius Bakke
0 siblings, 0 replies; 4+ messages in thread
From: Marius Bakke @ 2022-07-20 13:12 UTC (permalink / raw)
To: Jean Pierre De Jesus DIAZ, 56252@debbugs.gnu.org
> 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.
Pushed to 'staging' in 7767d30f55, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-20 13:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [bug#56252] Fw: " Jean Pierre De Jesus DIAZ via Guix-patches via
2022-07-20 13:12 ` bug#56252: " Marius Bakke
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).