me/guix
Archived
1
0
Fork 0
Code Activity

gnu: conkeror: Upgrade to 1.0pre1.20150730.

Browse source 
* gnu/packages/conkeror.scm (conkeror): Upgrade to 1.0pre1.20150730.
  [arguments]: Adjust #:make-flags and #:phases for new Makefile, and
  use modify-phases.
This commit is contained in:
Eric Bavier 2015-10-21 16:29:54 -05:00
parent fe4c37c244
commit 1a65667240
1 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/conkeror.scm
View file

@ -1,6 +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> ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,46 +28,42 @@
(define-public conkeror (define-public conkeror
(package (package
(name "conkeror") (name "conkeror")
(version "1.0pre1") (version "1.0pre1.20150730")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append "http://repo.or.cz/w/conkeror.git/snapshot/" (string-append "http://repo.or.cz/w/conkeror.git/snapshot/"
"8a26fff5896a3360549e2adfbf06b1d57e909266" "a1f7e879b129df5cf14ea4ce80a9c1407380ed58"
".tar.gz")) ; tag: debian-1.0--pre-1+git140616-1 ".tar.gz")) ; tag: debian-1.0--pre-1+git150730-1
(sha256 (sha256
(base32 (base32
"1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1")))) "1q45hc30733gz3ca2ixvw0rzzcbi7rlay7gx7kvzjv17a030nyk0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("icecat" ,icecat))) (inputs `(("icecat" ,icecat)))
(arguments (arguments
`(#:tests? #f ;no tests `(#:tests? #f ;no tests
#:make-flags '("CC=gcc") #:make-flags `("CC=gcc"
,(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (delete 'configure)
(alist-replace (add-after
'install 'install 'install-app-launcher
(lambda _ (lambda* (#:key inputs outputs #:allow-other-keys)
(begin ;; This overwrites the installed launcher, which execs xulrunner,
(use-modules (guix build utils)) ;; with one that execs 'icecat --app'
(let* ((datadir (string-append %output "/share/conkeror")) (let* ((out (assoc-ref outputs "out"))
(bindir (string-append %output "/bin")) (datadir (string-append out "/share/conkeror"))
(launcher (string-append bindir "/conkeror")) (launcher (string-append out "/bin/conkeror")))
(spawn (string-append bindir "/conkeror-spawn-helper"))) (call-with-output-file launcher
(copy-recursively "." datadir) (lambda (p)
(mkdir-p bindir) (format p "#!~a/bin/bash
(copy-file "conkeror-spawn-helper" spawn)
(call-with-output-file launcher
(lambda (p)
(format p "#!~a/bin/bash
exec ~a/bin/icecat --app ~a \"$@\"~%" exec ~a/bin/icecat --app ~a \"$@\"~%"
(assoc-ref %build-inputs "bash") ;implicit input (assoc-ref inputs "bash") ;implicit input
(assoc-ref %build-inputs "icecat") (assoc-ref 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 Firefox. Mozilla XULRunner which is the base of all Mozilla products including Firefox.