[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/10: gnu: python: Move tkinter to "tk" output.
From: |
Ludovic Courtès |
Subject: |
10/10: gnu: python: Move tkinter to "tk" output. |
Date: |
Thu, 26 Nov 2015 17:02:14 +0000 |
civodul pushed a commit to branch tk-update
in repository guix.
commit 5c9a1a8d0c9bf7625164346e25981b08c64c31f3
Author: Ludovic Courtès <address@hidden>
Date: Sun Nov 15 22:27:45 2015 +0100
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.
---
gnu/packages/python.scm | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 43334b5..7dd8725 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -96,6 +96,8 @@
'("python-2.7-search-paths.patch"
"python-2-deterministic-build-info.patch"
"python-2.7-source-date-epoch.patch")))))
+ (outputs '("out"
+ "tk")) ;tkinter; adds 50 MiB to the closure
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@@ -200,7 +202,28 @@
(ftw "." (lambda (file stat flag)
(utime file circa-1980 circa-1980)
#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
`(("bzip2" ,bzip2)
("gdbm" ,gdbm)
@@ -261,6 +284,7 @@ data types.")
(define-public python2-minimal
(package (inherit python-2)
(name "python-minimal")
+ (outputs '("out"))
(arguments
(substitute-keyword-arguments (package-arguments python-2)
((#:configure-flags cf)
@@ -270,6 +294,7 @@ data types.")
(define-public python-minimal
(package (inherit python)
(name "python-minimal")
+ (outputs '("out"))
(arguments
(substitute-keyword-arguments (package-arguments python)
((#:configure-flags cf)
@@ -285,6 +310,7 @@ data types.")
(name name)
(source #f)
(build-system trivial-build-system)
+ (outputs '("out"))
(propagated-inputs `(("python" ,python)))
(arguments
`(#:modules ((guix build utils))
- branch tk-update created (now 5c9a1a8), Ludovic Courtès, 2015/11/26
- 01/10: http-client: 'http-fetch' and 'http-fetch/cached' support HTTPS., Ludovic Courtès, 2015/11/26
- 05/10: gnu: python: Set SOURCE_DATE_EPOCH to 1 instead of 0., Ludovic Courtès, 2015/11/26
- 02/10: tk: Hardcode path to TK_LIBRARY., Ludovic Courtès, 2015/11/26
- 06/10: gnu: python: Make 'sys.version' deterministic., Ludovic Courtès, 2015/11/26
- 08/10: gnu: python: Do not record configure flags., Ludovic Courtès, 2015/11/26
- 07/10: gnu: python: Factorize configure flags with minimal variants., Ludovic Courtès, 2015/11/26
- 03/10: gnu: tcl: Produce 'tclIndex' files deterministically., Ludovic Courtès, 2015/11/26
- 04/10: gnu: python-2: Honor 'SOURCE_DATE_EPOCH'., Ludovic Courtès, 2015/11/26
- 09/10: gnu: python: Clarify and shorten the list of built-time modules., Ludovic Courtès, 2015/11/26
- 10/10: gnu: python: Move tkinter to "tk" output.,
Ludovic Courtès <=