me/guix
Archived
1
0
Fork 0
Code Activity

gnu: linux-libre: Use Python 3 in make-linux-libre-source.

Browse source 
Successfully tested with all of the linux-libre versions we carry in Guix:
4.4.234, 4.9.234, 4.14.195, 4.19.142, 5.4.61 and 5.8.5.

* gnu/packages/linux.scm (make-linux-libre-source): Replace python-2 by
python-wrapper.  Do not set the PYTHON environment variable, which is not
required when using python-wrapper.
This commit is contained in:
Maxim Cournoyer 2020-09-01 16:12:53 -04:00
parent ed66095679
commit b9a7fa817a
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/linux.scm
View file

@ -296,11 +296,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
#+(canonical-package bzip2) #+(canonical-package bzip2)
#+(canonical-package gzip) #+(canonical-package gzip)
#+(canonical-package tar) #+(canonical-package tar)
;; The comments in the 'deblob-check' script #+python-wrapper))
;; claim that it supports Python 2 and 3, but
;; in fact it fails when run in Python 3 as
;; of version 5.1.3.
#+python-2))
(with-directory-excursion "/tmp/bin" (with-directory-excursion "/tmp/bin"
@ -337,7 +333,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(error "multiple directories found" dirs))))) (error "multiple directories found" dirs)))))
(with-directory-excursion dir (with-directory-excursion dir
(setenv "PYTHON" (which "python"))
(format #t "Running deblob script...~%") (format #t "Running deblob script...~%")
(force-output) (force-output)
(invoke "/tmp/bin/deblob")) (invoke "/tmp/bin/deblob"))