diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2023-07-30 13:36:37 +0200 |
|---|---|---|
| committer | Lars-Dominik Braun <lars@6xq.net> | 2024-06-30 09:18:38 +0200 |
| commit | e1720e15b2f683a64d3060656fc9a93c600e6b63 (patch) | |
| tree | 3e3dd8aecb352eb3e9445236fa1a204a46b64cef | |
| parent | 28af7bc39efc88e6209d6424f809c3b1f54c9818 (diff) | |
guix: pyproject-build-system: Default configure-flags to empty dictionary.
PEP 517 specifies it should be a dictionary and thus meson-python cannot
handle an empty list.
Fixes: <https://issues.guix.gnu.org/62781>
* guix/build-system/pyproject.scm (lower): Change default of configure-flags.
* gnu/packages/build-tools.scm (meson-python)[arguments]: Remove #:build-backend,
which was a workaround for this bug.
[native-inputs]: Remove python-p~a-build and python-wheel, which are
not required when using the default build system.
Change-Id: I240ced5c88cf55cbee0d6005d7657bfb6b653b12
| -rw-r--r-- | gnu/packages/build-tools.scm | 10 | ||||
| -rw-r--r-- | guix/build-system/pyproject.scm | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index c0cba8076f..346c80aab8 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -355,10 +355,7 @@ resembles Python.") "0vyjhjabvm41hqijifk33idbdl62i76kfyf884f9rs29rpp77nzx")))) (build-system pyproject-build-system) (arguments - ;; The project is configured to use itself to build ('mesonpy') and fails; - ;; use another PEP 517 build system. - (list #:build-backend "setuptools.build_meta" - #:test-flags #~(list "tests" + (list #:test-flags #~(list "tests" ;; The test_pep518 tries to install ;; dependencies from the network using pip. "-k" "not test_pep518") @@ -379,10 +376,7 @@ resembles Python.") python-typing-extensions python-wheel)) (native-inputs - (list python-pypa-build - python-wheel - - ;; For tests. + (list ;; For tests. git-minimal/pinned patchelf pkg-config diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 585117cbf0..c0e089eac7 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -93,7 +93,7 @@ (define* (pyproject-build name inputs #:key source (tests? #t) - (configure-flags ''()) + (configure-flags ''(@)) (backend-path #f) (build-backend #f) (test-backend #f) |