summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-01-11 09:29:10 +0800
committer宋文武 <iyzsong@gmail.com>2015-01-11 19:14:53 +0800
commit4923e06f2168632d1ef40bfcd1b36a43de85e561 (patch)
tree0e86e5ab6ce75a2849428661f12d4f821f511208
parentc2d9355c369975c22f50c7f782c7e8fad8d89ab6 (diff)
gnu: Move mozjs and nspr to (gnu packages gnuzilla).
* gnu/packages/polkit.scm (mozjs, nspr): Move to... * gnu/packages/gnuzilla.scm (mozjs, nspr): ... here. New variables.
-rw-r--r--gnu/packages/gnuzilla.scm72
-rw-r--r--gnu/packages/polkit.scm75
2 files changed, 74 insertions, 73 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 3ebc20dffa..a60ff76298 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -42,6 +42,78 @@
#:use-module (gnu packages yasm)
#:use-module (gnu packages zip))
+(define-public mozjs
+ (package
+ (name "mozjs")
+ (version "17.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/js/"
+ name version ".tar.gz"))
+ (sha256
+ (base32
+ "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("perl", perl)
+ ("python" ,python-2)))
+ (arguments
+ `(#:phases
+ (alist-cons-before
+ 'configure 'chdir
+ (lambda _
+ (chdir "js/src"))
+ (alist-replace
+ 'configure
+ ;; configure fails if it is followed by SHELL and CONFIG_SHELL
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (zero? (system*
+ "./configure" (string-append "--prefix=" out)))))
+ %standard-phases))))
+ (home-page
+ "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey")
+ (synopsis "Mozilla javascript engine")
+ (description "SpiderMonkey is Mozilla's JavaScript engine written
+in C/C++.")
+ (license license:mpl2.0))) ; and others for some files
+
+(define-public nspr
+ (package
+ (name "nspr")
+ (version "4.10.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
+ version "/src/nspr-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0f1ri51yzjikigf6z31g03cdv6sgi9gw2c3vvv39psk3m37zb6iq"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("perl", perl)))
+ (arguments
+ `(#:tests? #f ; no check target
+ #:configure-flags
+ `("--enable-64bit")
+ #:phases
+ (alist-cons-before
+ 'configure 'chdir
+ (lambda _
+ (chdir "nspr"))
+ %standard-phases)))
+ (home-page
+ "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR")
+ (synopsis "Netscape API for system level and libc-like functions")
+ (description "Netscape Portable Runtime (NSPR) provides a
+platform-neutral API for system level and libc-like functions. It is used
+in the Mozilla clients.")
+ (license license:mpl2.0)))
+
(define-public icecat
(package
(name "icecat")
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 2be1d0b425..572d52404b 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -17,13 +17,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages polkit)
- #:use-module ((guix licenses) #:select (lgpl2.0+ mpl2.0))
+ #:use-module ((guix licenses) #:select (lgpl2.0+))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnuzilla)
#:use-module (gnu packages linux)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -31,78 +32,6 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages xml))
-(define-public mozjs
- (package
- (name "mozjs")
- (version "17.0.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://ftp.mozilla.org/pub/mozilla.org/js/"
- name version ".tar.gz"))
- (sha256
- (base32
- "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("perl", perl)
- ("python" ,python-2)))
- (arguments
- `(#:phases
- (alist-cons-before
- 'configure 'chdir
- (lambda _
- (chdir "js/src"))
- (alist-replace
- 'configure
- ;; configure fails if it is followed by SHELL and CONFIG_SHELL
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (setenv "SHELL" (which "sh"))
- (setenv "CONFIG_SHELL" (which "sh"))
- (zero? (system*
- "./configure" (string-append "--prefix=" out)))))
- %standard-phases))))
- (home-page
- "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey")
- (synopsis "Mozilla javascript engine")
- (description "SpiderMonkey is Mozilla's JavaScript engine written
-in C/C++.")
- (license mpl2.0))) ; and others for some files
-
-(define-public nspr
- (package
- (name "nspr")
- (version "4.10.7")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
- version "/src/nspr-" version ".tar.gz"))
- (sha256
- (base32
- "0f1ri51yzjikigf6z31g03cdv6sgi9gw2c3vvv39psk3m37zb6iq"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("perl", perl)))
- (arguments
- `(#:tests? #f ; no check target
- #:configure-flags
- `("--enable-64bit")
- #:phases
- (alist-cons-before
- 'configure 'chdir
- (lambda _
- (chdir "nspr"))
- %standard-phases)))
- (home-page
- "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR")
- (synopsis "Netscape API for system level and libc-like functions")
- (description "Netscape Portable Runtime (NSPR) provides a
-platform-neutral API for system level and libc-like functions. It is used
-in the Mozilla clients.")
- (license mpl2.0)))
-
(define-public polkit
(package
(name "polkit")