nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: conkeror: install conkeror-spawn-helper. 

* gnu/packages/conkeror.scm (conkeror)[build-system]: Change to
  gnu-build-system.  Adjust arguments accordingly.
  [inputs]: Remove now-implicit bash.
  [native-inputs]: Remove now-implicit tar and gzip.
  [description]: Fix two-space-after-end-of-sentence.  Remove comment
  about separate conkeror-spawn-process-helper package.
This commit is contained in:
Eric Bavier 2014-10-07 17:33:00 -05:00
parent be3425e5a9
commit 36160ebbfb
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gnu/packages/conkeror.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,13 +21,9 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system trivial) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gnuzilla) #:use-module (gnu packages gnuzilla))
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (ice-9 format))
(define-public conkeror (define-public conkeror
(package (package
@ -41,52 +38,46 @@
(sha256 (sha256
(base32 (base32
"1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1")))) "1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1"))))
(build-system trivial-build-system) (build-system gnu-build-system)
(inputs `(("icecat" ,icecat) (inputs `(("icecat" ,icecat)))
("bash" ,bash)))
(native-inputs `(("tar" ,tar)
("gzip" ,gzip)))
(arguments (arguments
`(#:modules ((guix build utils)) `(#:tests? #f ;no tests
#:builder (begin #:make-flags '("CC=gcc")
(use-modules (ice-9 ftw) #:phases
(guix build utils)) (alist-delete
(let ((select? 'configure
(lambda (name) (alist-replace
(not (equal? (car (string->list name)) #\.)))) 'install
(datadir (string-append %output "/share/conkeror")) (lambda _
(launcher "bin/conkeror")) (begin
(setenv "PATH" (string-append (use-modules (guix build utils))
(assoc-ref %build-inputs "tar") "/bin:" (let* ((datadir (string-append %output "/share/conkeror"))
(assoc-ref %build-inputs "gzip") "/bin")) (bindir (string-append %output "/bin"))
(system* "tar" "xvf" (assoc-ref %build-inputs "source")) (launcher (string-append bindir "/conkeror"))
(copy-recursively (string-append (spawn (string-append bindir "/conkeror-spawn-helper")))
(getcwd) "/" (copy-recursively "." datadir)
(car (scandir (getcwd) select?))) (mkdir-p bindir)
datadir) (copy-file "conkeror-spawn-helper" spawn)
(chdir %output)
(mkdir "bin")
(call-with-output-file launcher (call-with-output-file launcher
(lambda (p) (lambda (p)
(format p "#!~a/bin/bash (format p "#!~a/bin/bash
exec ~a/bin/icecat --app ~a \"$@\"~%" exec ~a/bin/icecat --app ~a \"$@\"~%"
(assoc-ref %build-inputs "bash") (assoc-ref %build-inputs "bash") ;implicit input
(assoc-ref %build-inputs "icecat") (assoc-ref %build-inputs "icecat")
(string-append datadir (string-append datadir
"/application.ini")))) "/application.ini"))))
(chmod launcher #o555))))) (chmod launcher #o555))))
%standard-phases))))
(synopsis "Keyboard focused web browser with Emacs look and feel") (synopsis "Keyboard focused web browser with Emacs look and feel")
(description "Conkeror is a highly-programmable web browser based on (description "Conkeror is a highly-programmable web browser based on
Mozilla XULRunner which is the base of all Mozilla products including Mozilla XULRunner which is the base of all Mozilla products including Firefox.
Firefox. Conkeror has a sophisticated keyboard system for running commands and Conkeror has a sophisticated keyboard system for running commands and
interacting with web page content, modelled after Emacs and Lynx. It is interacting with web page content, modelled after Emacs and Lynx. It is
self-documenting and extensible with JavaScript. self-documenting and extensible with JavaScript.
It comes with builtin support for several Web 2.0 sites like several Google It comes with builtin support for several Web 2.0 sites like several Google
services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and
YouTube. For easier editing of form fields, it can spawn external editors. For YouTube. For easier editing of form fields, it can spawn external editors.")
this feature the recommended conkeror-spawn-process-helper package needs to be
installed.")
(home-page "http://conkeror.org") (home-page "http://conkeror.org")
;; Conkeror is triple licensed. ;; Conkeror is triple licensed.
(license (list license:gpl2 (license (list license:gpl2