summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-01-31 23:25:27 +0100
committerLudovic Courtès <ludo@gnu.org>2016-02-01 08:59:13 +0100
commitf0907d97d43937d5bdde3b6440184325a80e0528 (patch)
treebbfaf032e706d16c44f858c01db1881aa0b97cd1
parenta4db2dd99f83225a303febf0a1439ea67ef1768c (diff)
downloadguix-f0907d97d43937d5bdde3b6440184325a80e0528.tar.gz
build-system/python: Use 'ensure-keyword-arguments'.
* guix/build-system/python.scm (package-with-explicit-python): Use
'ensure-keyword-arguments'.
-rw-r--r--guix/build-system/python.scm13
1 files changed, 5 insertions, 8 deletions
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index 86efc1a715..9a80bd6799 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -101,14 +101,11 @@ NEW-PREFIX; otherwise, NEW-PREFIX is prepended to the name."
                                                      (string-length old-prefix))
                                           name))))
                (arguments
-                (let ((arguments (package-arguments p))
-                      (python    (if (promise? python)
-                                     (force python)
-                                     python)))
-                  (if (member #:python arguments)
-                      (substitute-keyword-arguments arguments
-                        ((#:python p) python))
-                      (append arguments `(#:python ,python)))))
+                (let ((python (if (promise? python)
+                                  (force python)
+                                  python)))
+                  (ensure-keyword-arguments (package-arguments p)
+                                            `(#:python ,python))))
                (inputs (map rewrite (package-inputs p)))
                (propagated-inputs (map rewrite (package-propagated-inputs p)))
                (native-inputs (map rewrite (package-native-inputs p))))