[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/09: gnu: address@hidden: Use more inherited fields.
From: |
Efraim Flashner |
Subject: |
07/09: gnu: address@hidden: Use more inherited fields. |
Date: |
Tue, 28 Mar 2017 03:17:39 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit aaac423cc4350dd9df9755d0230e3dad454e3f72
Author: Efraim Flashner <address@hidden>
Date: Mon Mar 27 19:12:10 2017 +0300
gnu: address@hidden: Use more inherited fields.
* gnu/packages/gnuzilla.scm (address@hidden)[arguments]: Use
'substitute-keyword-arguments', override inherited 'configure.
[native-inputs]: Remove field to use inherited native-inputs.
[propagated-inputs]: Same.
---
gnu/packages/gnuzilla.scm | 50 ++++++++++++++++++-----------------------------
1 file changed, 19 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 3034ee9..1c3db57 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -28,6 +28,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages base)
#:use-module (gnu packages databases)
@@ -135,37 +136,24 @@ in C/C++.")
'(substitute* '("js/src/config/milestone.pl")
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")))))
(arguments
- `(;; XXX: parallel build fails, lacking:
- ;; mkdir -p "system_wrapper_js/"
- #:parallel-build? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'delete-timedout-test
- ;; This test times out on slower hardware
- (lambda _ (delete-file "js/src/jit-test/tests/basic/bug698584.js")))
- (replace
- 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (chdir "js/src")
- ;; configure fails if it is follwed by SHELL and CONFIG_SHELL
- (setenv "SHELL" (which "sh"))
- (setenv "CONFIG_SHELL" (which "sh"))
- (zero? (system* "./configure"
- (string-append "--prefix=" out)
- "--with-system-nspr"
- "--enable-system-ffi"
- "--enable-threadsafe"
- ,@(if (string=? "aarch64-linux"
- (%current-system))
- '("--host=aarch64-unknown-linux-gnu")
- '())))))))))
- (native-inputs
- `(("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-2)))
- (propagated-inputs
- `(("nspr" ,nspr))) ; in the Requires.private field of mozjs-24.pc
+ (substitute-keyword-arguments (package-arguments mozjs)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; configure fails if it is followed by SHELL and
CONFIG_SHELL
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (zero? (system* "./configure"
+ (string-append "--prefix=" out)
+ "--with-system-nspr"
+ "--enable-system-ffi"
+ "--enable-threadsafe"
+ ,@(if (string=? "aarch64-linux"
+ (%current-system))
+ '("--host=aarch64-unknown-linux-gnu")
+ '()))))))))))
(inputs
`(("libffi" ,libffi)
("zlib" ,zlib)))))
- branch core-updates updated (c17383f -> 04952bd), Efraim Flashner, 2017/03/28
- 02/09: gnu: mysql: Disable tests on aarch64-linux., Efraim Flashner, 2017/03/28
- 06/09: gnu: address@hidden: Use 'modify-phases' syntax., Efraim Flashner, 2017/03/28
- 09/09: gnu: nspr: Use 'modify-phases' syntax., Efraim Flashner, 2017/03/28
- 01/09: gnu: gsl: Disable tests on aarch64-linux., Efraim Flashner, 2017/03/28
- 05/09: gnu: address@hidden: Add missing inputs., Efraim Flashner, 2017/03/28
- 08/09: gnu: nspr: Update to 4.14., Efraim Flashner, 2017/03/28
- 04/09: gnu: address@hidden: Add support for aarch64-linux., Efraim Flashner, 2017/03/28
- 03/09: gnu: address@hidden: Add aarch64-support., Efraim Flashner, 2017/03/28
- 07/09: gnu: address@hidden: Use more inherited fields.,
Efraim Flashner <=