[PATCH] gnu: openctm: Correct inputs vs native-inputs

DoneSubmitted by Ekaitz Zarraga.
Details
3 participants
  • Ekaitz Zarraga
  • Jonathan Brielmaier
  • Ludovic Courtès
Owner
unassigned
Severity
normal
E
E
Ekaitz Zarraga wrote on 16 May 2020 00:57
Download
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
zNBmy4CTl_peMQ-9S7lElZFjofYW1DVtSTtDOyq9Rk7zWkYaJxkZYJmN7FUV0sqdkrWugMehtMlO-gwglkTXx_biL9ZyvdIf1TI-CdNKJ2Q=@elenq.tech
Download
From 417f64adc854e5d717351fec68872ed19a9ac3df Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Sat, 16 May 2020 00:49:53 +0200
Subject: [PATCH] gnu: openctm: Correct inputs vs native-inputs

* gnu/packages/engineering.scm (openctm): Change inputs
---
gnu/packages/engineering.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index aec692174a..aab414bf0e 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2557,11 +2557,12 @@ official SDK.")
           (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1"))))
       (build-system gnu-build-system)
       (native-inputs
+       `(("pkg-config" ,pkg-config)))
+      (inputs
        `(("mesa" ,mesa)
          ("glu" ,glu)
          ("glut" ,freeglut)
-         ("gtk" ,gtk+-2)
-         ("pkg-config" ,pkg-config)))
+         ("gtk" ,gtk+-2)))
       (arguments
        `(#:tests? #f                              ;no tests
          #:phases
--
2.26.1
J
J
Jonathan Brielmaier wrote on 16 May 2020 01:35
Download
7299b00f-d6af-89f5-16ea-a71101e9049c@web.de
Download
On 16.05.20 00:57, Ekaitz Zarraga wrote:
Toggle quote (5 lines)
> From 417f64adc854e5d717351fec68872ed19a9ac3df Mon Sep 17 00:00:00 2001
> From: Ekaitz Zarraga <ekaitz@elenq.tech>
> Date: Sat, 16 May 2020 00:49:53 +0200
> Subject: [PATCH] gnu: openctm: Correct inputs vs native-inputs

Please add a dot add the end of sentences.

Toggle quote (2 lines)
> * gnu/packages/engineering.scm (openctm): Change inputs

Maybe rephrase it to: Move pkg-config to native-inputs.

Toggle quote (25 lines)
> ---
> gnu/packages/engineering.scm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
> index aec692174a..aab414bf0e 100644
> --- a/gnu/packages/engineering.scm
> +++ b/gnu/packages/engineering.scm
> @@ -2557,11 +2557,12 @@ official SDK.")
> (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1"))))
> (build-system gnu-build-system)
> (native-inputs
> + `(("pkg-config" ,pkg-config)))
> + (inputs
> `(("mesa" ,mesa)
> ("glu" ,glu)
> ("glut" ,freeglut)
> - ("gtk" ,gtk+-2)
> - ("pkg-config" ,pkg-config)))
> + ("gtk" ,gtk+-2)))
> (arguments
> `(#:tests? #f ;no tests
> #:phases
> --

Otherwise it looks good.
E
E
Ekaitz Zarraga wrote on 16 May 2020 11:57
Download
(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)(name . 41297@debbugs.gnu.org)(address . 41297@debbugs.gnu.org)
EZDdxC7aKUf7TnrwE8f2cUCNTQuV_7QqgynWEy4mRa0xtiOXHIufnDteE7emLhmvYf_Ppexo40JTNngrMHWsw8S4677xBvVIRL5GAb03kKk=@elenq.tech
Download
Hi,

Toggle quote (4 lines)
>
> Maybe rephrase it to: Move pkg-config to native-inputs.
>

In fact, the pkg-config is the only one that it's not moved. The change is moving all of the others to inputs.

I really bad at describing what I did. I don't know how to say it short and accurately :D

Thanks!
J
J
Jonathan Brielmaier wrote on 16 May 2020 12:06
Download
(name . Ekaitz Zarraga)(address . ekaitz@elenq.tech)(name . 41297@debbugs.gnu.org)(address . 41297@debbugs.gnu.org)
2d2b1aee-69ac-76ec-fed5-00f478403ffe@web.de
Download
On 16.05.20 11:57, Ekaitz Zarraga wrote:
Toggle quote (10 lines)
> Hi,
>
>>
>> Maybe rephrase it to: Move pkg-config to native-inputs.
>>
>
> In fact, the pkg-config is the only one that it's not moved. The change is moving all of the others to inputs.
>
> I really bad at describing what I did. I don't know how to say it short and accurately :D

Ah, so it's the other way round. So move mesa, glu, glut and gtk+-2 to
inputs.
E
E
Ekaitz Zarraga wrote on 16 May 2020 12:24
Download
(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)(name . 41297@debbugs.gnu.org)(address . 41297@debbugs.gnu.org)
IfPdXsGgkuTydGKCn5gYq9NI_DVU3o1Lwxu8PvrCMKldek1ENyBvZUGAEKm_a9gjcXeCu77lflrPMz_si3kypODt57fT3hSdd5VeNdIkB2g=@elenq.tech
Download
Hi,

Toggle quote (3 lines)
> Ah, so it's the other way round. So move mesa, glu, glut and gtk+-2 to
> inputs.

Short and accurate. Thanks

Here it goes:



From 9e6f5503fd8837bcbb03eed3a05d6105b1752fc3 Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Sat, 16 May 2020 12:22:09 +0200
Subject: [PATCH] gnu: openctm: Correct inputs vs native-inputs

* gnu/packages/engineering.scm (openctm): Move mesa, glu, glut and
gtk+-2 to inputs
---
gnu/packages/engineering.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index aec692174a..aab414bf0e 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2557,11 +2557,12 @@ official SDK.")
           (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1"))))
       (build-system gnu-build-system)
       (native-inputs
+       `(("pkg-config" ,pkg-config)))
+      (inputs
        `(("mesa" ,mesa)
          ("glu" ,glu)
          ("glut" ,freeglut)
-         ("gtk" ,gtk+-2)
-         ("pkg-config" ,pkg-config)))
+         ("gtk" ,gtk+-2)))
       (arguments
        `(#:tests? #f                              ;no tests
          #:phases
--
2.26.1
L
L
Ludovic Courtès wrote on 16 May 2020 19:24
Download
(name . Ekaitz Zarraga)(address . ekaitz@elenq.tech)
878shrrdww.fsf@gnu.org
Download
Hi,

Ekaitz Zarraga <ekaitz@elenq.tech> skribis:

Toggle quote (8 lines)
>>From 9e6f5503fd8837bcbb03eed3a05d6105b1752fc3 Mon Sep 17 00:00:00 2001
> From: Ekaitz Zarraga <ekaitz@elenq.tech>
> Date: Sat, 16 May 2020 12:22:09 +0200
> Subject: [PATCH] gnu: openctm: Correct inputs vs native-inputs
>
> * gnu/packages/engineering.scm (openctm): Move mesa, glu, glut and
> gtk+-2 to inputs

Applied, thanks, and sorry for not catching it earlier!

Ludo’.
L
L
Ludovic Courtès wrote on 18 May 2020 14:31
Download
control message for bug #41297
(address . control@debbugs.gnu.org)
87o8qlifvs.fsf@gnu.org
Download
tags 41297 fixed
close 41297
quit
?
Your comment

This issue is archived.

To comment on this conversation send email to 41297@debbugs.gnu.org