me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2021-05-13 12:34:17 +02:00
parent 426bed1f39
commit 8be3cd6ce9
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/build-tools.scm
View File

@ -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}