me/guix
Archived
1
0
Fork 0
Code Activity

gnu: meson-wrapped: Do not propagate Python.

Browse source 
* gnu/packages/build-tools.scm (meson-wrapped)[propagated-inputs,
inputs]: New fields.
This commit is contained in:
Ludovic Courtès 2021-11-22 22:36:47 +01:00
parent 021d3a32f5
commit f12cf46eed
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/build-tools.scm
View file

@ -285,7 +285,12 @@ files and generates build instructions for the Ninja build system.")
;; Python interpreter, so we cannot use the shell wrapper. ;; Python interpreter, so we cannot use the shell wrapper.
(delete 'wrap)))) (delete 'wrap))))
(inputs `(("ninja" ,ninja))) (inputs `(("ninja" ,ninja)))
;; XXX: Python is propagated just to 'GUIX_PYTHONPATH' is set (!).
;; MESON-WRAPPED below fixes that by wrapping the 'meson' executable.
;; TODO: Make MESON-WRAPPED the new MESON on the next core update cycle.
(propagated-inputs `(("python" ,python))) (propagated-inputs `(("python" ,python)))
(home-page "https://mesonbuild.com/") (home-page "https://mesonbuild.com/")
(properties '((hidden? . #t))) (properties '((hidden? . #t)))
(synopsis "Build system designed to be fast and user-friendly") (synopsis "Build system designed to be fast and user-friendly")
@ -300,6 +305,9 @@ resembles Python.")
(define-public meson-wrapped (define-public meson-wrapped
(package/inherit meson (package/inherit meson
(propagated-inputs '()) ;don't propagate Python
(inputs (modify-inputs (package-inputs meson)
(prepend python-wrapper)))
(arguments (arguments
`(;; FIXME: Tests require many additional inputs and patching many `(;; FIXME: Tests require many additional inputs and patching many
;; hard-coded file system locations in "run_unittests.py". ;; hard-coded file system locations in "run_unittests.py".