guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/04: gnu: address@hidden: Add dependencies on libffi and zlib.


From: Ludovic Courtès
Subject: 02/04: gnu: address@hidden: Add dependencies on libffi and zlib.
Date: Sun, 19 Mar 2017 18:43:32 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 5927a843b4a91416b5be9e65c69616447f82e162
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 19 22:10:12 2017 +0100

    gnu: address@hidden: Add dependencies on libffi and zlib.
    
    * gnu/packages/python.scm (python2-minimal)[inputs]: Add LIBFFI and ZLIB.
    [arguments]: Remove.
---
 gnu/packages/python.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index be452f0..0059877 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -359,11 +359,12 @@ data types.")
   (package (inherit python-2)
     (name "python-minimal")
     (outputs '("out"))
-    (arguments
-     (substitute-keyword-arguments (package-arguments python-2)
-       ((#:configure-flags cf)
-        `(append ,cf '("--without-system-ffi")))))
-    (inputs '())))                          ;none of the optional dependencies
+
+    ;; Keep zlib, which is used by 'pip' (via the 'zipimport' module), which
+    ;; is invoked upon 'make install'.  'pip' also expects 'ctypes' and thus
+    ;; libffi.
+    (inputs `(("libffi" ,libffi)
+              ("zlib" ,zlib)))))
 
 (define-public python-minimal
   (package (inherit python)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]