01/02: gnu: gn: Build with Python 3.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 8be3cd6ce913d45c87e81a619452e392f2deb3a6
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu May 13 12:34:17 2021 +0200

    gnu: gn: Build with Python 3.
    
    * gnu/packages/build-tools.scm (gn)[native-inputs]: Change from PYTHON-2 to
    PYTHON-WRAPPER.
    [arguments]: Remove trailing #t's and make some cosmetic changes.
---
 gnu/packages/build-tools.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 87f393c..d2fb9e0 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -218,8 +218,7 @@ programs and other files depend.")
                     (add-before 'configure 'set-build-environment
                       (lambda _
                         (setenv "CC" "gcc") (setenv "CXX" "g++")
-                        (setenv "AR" "ar")
-                        #t))
+                        (setenv "AR" "ar")))
                     (replace 'configure
                       (lambda _
                         (invoke "python" "build/gen.py"
@@ -234,16 +233,15 @@ programs and other files depend.")
                                     (string-append
                                      "#define LAST_COMMIT_POSITION_NUM ~a\n"
                                      "#define LAST_COMMIT_POSITION \"~a 
(~a)\"\n")
-                                    ,revision ,revision ,(string-take commit 
8))
-                            #t))))
+                                    ,revision ,revision ,(string-take commit 
8))))))
                     (replace 'build
                       (lambda _
                         (invoke "ninja" "-C" "out" "gn"
                                 "-j" (number->string (parallel-job-count)))))
                     (replace 'check
-                      (lambda* (#:key (tests? #t) #:allow-other-keys)
+                      (lambda* (#:key tests? #:allow-other-keys)
                         (if tests?
-                            (lambda ()
+                            (begin
                               (invoke "ninja" "-C" "out" "gn_unittests"
                                       "-j" (number->string 
(parallel-job-count)))
                               (invoke "./out/gn_unittests"))
@@ -251,11 +249,10 @@ programs and other files depend.")
                     (replace 'install
                       (lambda* (#:key outputs #:allow-other-keys)
                         (let ((out (assoc-ref outputs "out")))
-                          (install-file "out/gn" (string-append out "/bin"))
-                          #t))))))
+                          (install-file "out/gn" (string-append out 
"/bin"))))))))
       (native-inputs
        `(("ninja" ,ninja)
-         ("python" ,python-2)))
+         ("python" ,python-wrapper)))
       (synopsis "Generate Ninja build files")
       (description
        "GN is a tool that collects information about a project from @file{.gn}