[bug#72351] gnu: nsis: Use scons 3 over scons-python2

Message ID CAFyhPjWV=38eajriYWEm=8naq5pEXcWMCd2h5NOvvTU__yaOeA@mail.gmail.com
State New
Headers
Series [bug#72351] gnu: nsis: Use scons 3 over scons-python2 |

Commit Message

Michael Ford July 29, 2024, 11:01 a.m. UTC
  Rather than building NSIS with Scons 3 using Python2, switch to Scons
3 with Python 3.

From c49419c7dc262f81d664fcab4c7fd200d3627c05 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 29 Jul 2024 11:55:07 +0100
Subject: [PATCH] gnu: nsis: Use scons 3 over scons-python2

---
 gnu/packages/installers.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Z572 Aug. 1, 2024, 3:57 p.m. UTC | #1
Michael Ford <fanquake@gmail.com> writes:

> Rather than building NSIS with Scons 3 using Python2, switch to Scons
> 3 with Python 3.
>
> From c49419c7dc262f81d664fcab4c7fd200d3627c05 Mon Sep 17 00:00:00 2001
> From: fanquake <fanquake@gmail.com>
> Date: Mon, 29 Jul 2024 11:55:07 +0100
> Subject: [PATCH] gnu: nsis: Use scons 3 over scons-python2
>
> ---
>  gnu/packages/installers.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
> index d1145a5d58..fb8b71be79 100644
> --- a/gnu/packages/installers.scm
> +++ b/gnu/packages/installers.scm
> @@ -49,7 +49,7 @@ (define (make-nsis machine target-arch nsis-target-type)
>                         ("mingw-w64" ,xlibc)))
>        (inputs (list zlib))
>        (arguments
> -       `(#:scons ,scons-python2
> +       `(#:scons ,scons-3
>           #:modules ((srfi srfi-1)
>                      (srfi srfi-26)
>                      (guix build utils)

thanks, push, close
  

Patch

diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
index d1145a5d58..fb8b71be79 100644
--- a/gnu/packages/installers.scm
+++ b/gnu/packages/installers.scm
@@ -49,7 +49,7 @@  (define (make-nsis machine target-arch nsis-target-type)
                        ("mingw-w64" ,xlibc)))
       (inputs (list zlib))
       (arguments
-       `(#:scons ,scons-python2
+       `(#:scons ,scons-3
          #:modules ((srfi srfi-1)
                     (srfi srfi-26)
                     (guix build utils)