amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: python: Switch to python-wrapper as the default version for the python

Browse source 
build system (switches to Python 3) and compute python-version instead of
  passing it as a parameter.

* guix/build-system/python.scm (default-python): Switch to python-wrapper.
* guix/build-system/python.scm (python-build): Drop parameter #:python-version.
* guix/build/python-build-system.scm (wrap): Compute python version from input.
This commit is contained in:
Andreas Enge 2013-09-04 18:04:15 +02:00
parent ee3e314bb7
commit 3df47231e6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
guix/build/python-build-system.scm
View file

@ -53,7 +53,7 @@
(zero? (apply system* "python" args)))
(error "no setup.py found")))
(define* (wrap #:key outputs python-version #:allow-other-keys)
(define* (wrap #:key inputs outputs #:allow-other-keys)
(define (list-of-files dir)
(map (cut string-append dir "/" <>)
(or (scandir dir (lambda (f)
@ -69,6 +69,8 @@
outputs))
(let* ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python"))
(python-version (string-take (string-take-right python 5) 3))
(var `("PYTHONPATH" prefix
,(cons (string-append out "/lib/python"
python-version "/site-packages")