From 0d98cb9a391a06490feed8f10c0b442bab28cd9d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 17 Mar 2018 17:05:28 -0400 Subject: gnu: openssl: Simplify calls to 'invoke'. * gnu/packages/tls.scm (openssl, openssl-next)[arguments]: In the 'configure' phase, simplify the calls to 'invoke'. --- gnu/packages/tls.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f4a887a233..a915daed06 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -297,8 +297,7 @@ (define-public openssl 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (apply invoke "./config" - (list + (invoke "./config" "shared" ;build shared libraries "--libdir=lib" @@ -316,7 +315,7 @@ (define-public openssl ,@(if (and (not (%current-target-system)) (string-prefix? "armhf" (%current-system))) '("-mfpu=vfpv3") - '())))))) + '()))))) (add-after 'install 'make-libraries-writable (lambda* (#:key outputs #:allow-other-keys) @@ -422,8 +421,7 @@ (define-public openssl-next (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) - (apply invoke "./config" - (list + (invoke "./config" "shared" ;build shared libraries "--libdir=lib" @@ -442,7 +440,7 @@ (define-public openssl-next ,@(if (and (not (%current-target-system)) (string-prefix? "armhf" (%current-system))) '("-mfpu=vfpv3") - '())))))) + '()))))) ;; XXX: Duplicate this phase to make sure 'version' evaluates ;; in the current scope and not the inherited one. -- cgit v1.2.3