nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python: Move tkinter to "tk" output. 

* gnu/packages/python.scm (python-2)[outputs]: New field.
[arguments]: Add 'move-tk-inter' phase.
(python2-minimal, python-minimal, wrap-python3)[outputs]: New field.
This commit is contained in:
Ludovic Courtès 2015-11-15 22:27:45 +01:00
parent d2cc9c7cfd
commit 02f0c3b28e
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/python.scm
View File

@ -96,6 +96,8 @@
'("python-2.7-search-paths.patch" '("python-2.7-search-paths.patch"
"python-2-deterministic-build-info.patch" "python-2-deterministic-build-info.patch"
"python-2.7-source-date-epoch.patch"))))) "python-2.7-source-date-epoch.patch")))))
(outputs '("out"
"tk")) ;tkinter; adds 50 MiB to the closure
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
@ -200,7 +202,28 @@
(ftw "." (lambda (file stat flag) (ftw "." (lambda (file stat flag)
(utime file circa-1980 circa-1980) (utime file circa-1980 circa-1980)
#t)) #t))
#t)))))) #t)))
(add-after 'install 'move-tk-inter
(lambda* (#:key outputs #:allow-other-keys)
;; When Tkinter support is built move it to a separate output so
;; that the main output doesn't contain a reference to Tcl/Tk.
(let ((out (assoc-ref outputs "out"))
(tk (assoc-ref outputs "tk")))
(when tk
(match (find-files out "tkinter.*\\.so")
((tkinter.so)
;; The .so is in OUT/lib/pythonX.Y/lib-dynload, but we
;; want it under TK/lib/pythonX.Y/site-packages.
(let* ((len (string-length out))
(target (string-append
tk "/"
(string-drop
(dirname (dirname tkinter.so))
len)
"/site-packages")))
(install-file tkinter.so target)
(delete-file tkinter.so)))))
#t))))))
(inputs (inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("gdbm" ,gdbm) ("gdbm" ,gdbm)
@ -261,6 +284,7 @@ data types.")
(define-public python2-minimal (define-public python2-minimal
(package (inherit python-2) (package (inherit python-2)
(name "python-minimal") (name "python-minimal")
(outputs '("out"))
(arguments (arguments
(substitute-keyword-arguments (package-arguments python-2) (substitute-keyword-arguments (package-arguments python-2)
((#:configure-flags cf) ((#:configure-flags cf)
@ -270,6 +294,7 @@ data types.")
(define-public python-minimal (define-public python-minimal
(package (inherit python) (package (inherit python)
(name "python-minimal") (name "python-minimal")
(outputs '("out"))
(arguments (arguments
(substitute-keyword-arguments (package-arguments python) (substitute-keyword-arguments (package-arguments python)
((#:configure-flags cf) ((#:configure-flags cf)
@ -285,6 +310,7 @@ data types.")
(name name) (name name)
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
(outputs '("out"))
(propagated-inputs `(("python" ,python))) (propagated-inputs `(("python" ,python)))
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))