me/guix
Archived
1
0
Fork 0
Code Activity

gnu: mozjs: Use mozilla-build-system.

Browse source 
Due to the use of 'inherit', all versions of mozjs are adjusted.

* gnu/packages/gnuzilla.scm
  (mozjs)[build-system]: Adjust it.
  (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and
  --host.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Maxime Devos 2021-10-01 16:21:05 +02:00 • committed by Mathieu Othacehe
parent 385ba2f369
commit 5d8515b337
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/gnuzilla.scm
View file

@ -49,6 +49,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system cargo)
#:use-module (guix build-system trivial)
#:use-module (guix build-system mozilla)
#:use-module (gnu packages admin)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
@ -108,7 +109,7 @@
(substitute* '("js/src/config/milestone.pl")
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))
#t))))
(build-system gnu-build-system)
(build-system mozilla-build-system)
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
@ -390,15 +391,7 @@ in C/C++.")
;; This is important because without it gjs will segfault during the
;; configure phase. With jemalloc only the standalone mozjs console
;; will work.
"--disable-jemalloc"
;; Mozilla deviates from Autotools conventions due to historical
;; reasons.
#$@(if (%current-target-system)
#~(#$(string-append
"--host="
(nix-system->gnu-triplet (%current-system)))
#$(string-append "--target=" (%current-target-system)))
#~())))
"--disable-jemalloc"))
#:phases
(modify-phases %standard-phases
;; Make sure pkg-config will be found.