diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-01-28 08:33:34 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-07 12:28:48 +0100 |
| commit | 1a8a9898374fb88a2f1f27f138d85e9e971ba3fb (patch) | |
| tree | 128e5e6be1eff73d62b92e273db0350b643c5415 | |
| parent | e416c68d0eb33e7438ad3f142c4e41c0c8f02a3c (diff) | |
gnu: julia-pycall: Switch to pyproject.
* gnu/packages/julia-xyz.scm (julia-pycall):
[arguments]<#:imported-modules, #:modules>: Switch to
pyproject-build-system.
<#:phases>: Improve phase 'set-python.
Change-Id: I6b2899db709ef311e86308537bc98d9a06caef42
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
| -rw-r--r-- | gnu/packages/julia-xyz.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index c3c7872786e..d888c7d52ac 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -5445,11 +5445,11 @@ This can help users track the progress of long-running tasks.") (build-system julia-build-system) (arguments (list - #:imported-modules `((guix build python-build-system) + #:imported-modules `((guix build pyproject-build-system) ,@%julia-build-system-modules) #:modules '((guix build julia-build-system) (guix build utils) - ((guix build python-build-system) #:prefix python:)) + ((guix build pyproject-build-system) #:prefix py:)) #:phases #~(modify-phases %standard-phases (add-after 'link-depot 'remove-conda @@ -5463,23 +5463,23 @@ This can help users track the progress of long-running tasks.") (("Conda.PYTHONDIR") "\"/\"")))) (add-after 'link-depot 'set-python (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python"))) - (setenv "PYCALL_JL_RUNTIME_PYTHON" - (string-append python "/bin/python3")) + (let* ((python (search-input-file inputs "/bin/python3")) + (python-install (dirname (dirname python)))) + (setenv "PYCALL_JL_RUNTIME_PYTHON" python) (with-output-to-file "deps/deps.jl" (lambda _ (format #t - "const python = \"~a/bin/python3\"~@ - const pyprogramname = \"~a/bin/python3\"~@ + "const python = ~s~@ + const pyprogramname = ~s~@ const libpython = \"~a/lib/libpython~a.so.1.0\"~@ const PYTHONHOME = \"~a\"~@ const pyversion_build = v\"~a\"~@ const conda = false~%" python python - python - (python:python-version python) - python + python-install + (py:python-version python-install) + python-install #$(package-version python))))))) (add-before 'check 'pre-check (lambda _ |