From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flclG-0008WV-Hr for guix-patches@gnu.org; Fri, 03 Aug 2018 12:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flclC-0007zB-9t for guix-patches@gnu.org; Fri, 03 Aug 2018 12:17:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1flclC-0007z3-6N for guix-patches@gnu.org; Fri, 03 Aug 2018 12:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1flclB-0006wB-U7 for guix-patches@gnu.org; Fri, 03 Aug 2018 12:17:01 -0400 Subject: [bug#32364] [PATCH] gnu: Add mozjs-52. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flckB-0008Li-RO for guix-patches@gnu.org; Fri, 03 Aug 2018 12:16:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flck7-0007Pd-LQ for guix-patches@gnu.org; Fri, 03 Aug 2018 12:15:59 -0400 Received: from sinope02.bbbm.mdc-berlin.de ([141.80.25.24]:47094) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1flck7-0007Lm-9a for guix-patches@gnu.org; Fri, 03 Aug 2018 12:15:55 -0400 From: Ricardo Wurmus Date: Fri, 3 Aug 2018 18:15:42 +0200 Message-ID: <20180803161542.26246-1-ricardo.wurmus@mdc-berlin.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32364@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/gnuzilla.scm (mozjs-52): New variable. --- gnu/packages/gnuzilla.scm | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ba60d1372..79d05bdaa 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -8,6 +8,7 @@ ;;; Copyright =C2=A9 2017 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2017 Nils Gillmann ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages autotools) @@ -252,6 +254,60 @@ in C/C++.") ("icu4c" ,icu4c) ("zlib" ,zlib))))) =20 +(define-public mozjs-52 + ;; No releases yet at . + ;; While we could take a snapshot of the complete mozilla-esr52 reposi= tory at + ;; , + ;; we take the Debian version instead, because it is easier to work wi= th. + (let ((commit "6507e63cc416fd7a3269e390efe712f8b56f374a") + (revision "1")) + (package (inherit mozjs-38) + (version (git-version "52.0-0." revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/gnome-team/mozjs52.= git") + (commit commit))) + (file-name (git-file-name "mozjs" version)) + (sha256 + (base32 + "1ny0s53r8wn4byys87h784xrq1xg767akmfm6gqrbvrz57mlm3q2"= )))) + (arguments + `(#:tests? #f ; depends on repository metadata + #:configure-flags + '("--enable-ctypes" + "--enable-optimize" + "--enable-pie" + "--enable-readline" + "--enable-shared-js" + "--enable-system-ffi" + "--with-system-icu" + "--with-system-nspr" + "--with-system-zlib" + + ;; Intl API requires bundled ICU. + "--without-intl-api") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "js/src") #t)) + (replace 'configure + (lambda* (#:key inputs outputs configure-flags #:allow-othe= r-keys) + ;; The configure script does not accept environment varia= bles + ;; as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "AUTOCONF" (string-append (assoc-ref inputs "au= toconf") + "/bin/autoconf")) + (apply invoke "./configure" + (cons (string-append "--prefix=3D" out) + configure-flags)))))))) + (native-inputs + `(("autoconf" ,autoconf-2.13) + ("automake" ,automake) + ,@(package-native-inputs mozjs-38)))))) + (define-public nspr (package (name "nspr") --=20 2.18.0