From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730. Date: Thu, 22 Oct 2015 09:44:32 -0400 Message-ID: <87vb9zj9vj.fsf@netris.org> References: <83eaeebe60dcd79f5d624dc1ac2e0804@hcoop.net> <1445463958-3312-1-git-send-email-ericbavier@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpGAe-0007Gi-Vr for guix-devel@gnu.org; Thu, 22 Oct 2015 09:44:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpGAb-0001Uw-OW for guix-devel@gnu.org; Thu, 22 Oct 2015 09:44:44 -0400 Received: from world.peace.net ([50.252.239.5]:48139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpGAb-0001Us-Jz for guix-devel@gnu.org; Thu, 22 Oct 2015 09:44:41 -0400 In-Reply-To: <1445463958-3312-1-git-send-email-ericbavier@openmailbox.org> (ericbavier@openmailbox.org's message of "Wed, 21 Oct 2015 16:45:58 -0500") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: ericbavier@openmailbox.org Cc: guix-devel@gnu.org, Eric Bavier ericbavier@openmailbox.org writes: > From: Eric Bavier > > * gnu/packages/conkeror.scm (conkeror): Upgrade to 1.0pre1.20150730. > [arguments]: Adjust #:make-flags and #:phases for new Makefile, and > use modify-phases. Please see below for comments. > diff --git a/gnu/packages/conkeror.scm b/gnu/packages/conkeror.scm > index 51bb1a2..ebc66d1 100644 > --- a/gnu/packages/conkeror.scm > +++ b/gnu/packages/conkeror.scm > @@ -1,6 +1,6 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2014 Cyrill Schenkel > -;;; Copyright =C2=A9 2014 Eric Bavier > +;;; Copyright =C2=A9 2014, 2015 Eric Bavier > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -28,46 +28,41 @@ > (define-public conkeror > (package > (name "conkeror") > - (version "1.0pre1") > + (version "1.0pre1.20150730") > (source (origin > (method url-fetch) > (uri > (string-append "http://repo.or.cz/w/conkeror.git/snapshot= /" > - "8a26fff5896a3360549e2adfbf06b1d57e909266" > - ".tar.gz")) ; tag: debian-1.0--pre-1+git14= 0616-1 > + "a1f7e879b129df5cf14ea4ce80a9c1407380ed58" > + ".tar.gz")) ; tag: debian-1.0--pre-1+git15= 0730-1 > (sha256 > (base32 > - "1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1"))= )) > + "1q45hc30733gz3ca2ixvw0rzzcbi7rlay7gx7kvzjv17a030nyk0"))= )) > (build-system gnu-build-system) > (inputs `(("icecat" ,icecat))) > (arguments > `(#:tests? #f ;no tests > - #:make-flags '("CC=3Dgcc") > + #:make-flags `("CC=3Dgcc" > + ,(string-append "PREFIX=3D" (assoc-ref %outputs "o= ut"))) > #:phases > - (alist-delete > - 'configure > - (alist-replace > - 'install > - (lambda _ > - (begin > - (use-modules (guix build utils)) > - (let* ((datadir (string-append %output "/share/conkeror")) > - (bindir (string-append %output "/bin")) > - (launcher (string-append bindir "/conkeror")) > - (spawn (string-append bindir "/conkeror-spawn-he= lper"))) > - (copy-recursively "." datadir) > - (mkdir-p bindir) > - (copy-file "conkeror-spawn-helper" spawn) > - (call-with-output-file launcher > - (lambda (p) > - (format p "#!~a/bin/bash > + (modify-phases %standard-phases > + (delete 'configure) > + (add-after > + 'install 'install-app-launcher > + (lambda _ > + ;; This overwrites the installed launcher, which execs xulru= nner, > + ;; with one that execs 'icecat --app' > + (let* ((datadir (string-append %output "/share/conkeror")) > + (launcher (string-append %output "/bin/conkeror"))) > + (call-with-output-file launcher > + (lambda (p) > + (format p "#!~a/bin/bash > exec ~a/bin/icecat --app ~a \"$@\"~%" > - (assoc-ref %build-inputs "bash") ;implicit in= put > - (assoc-ref %build-inputs "icecat") > - (string-append datadir > - "/application.ini")))) > - (chmod launcher #o555)))) > - %standard-phases)))) > + (assoc-ref %build-inputs "bash") ;implicit inp= ut > + (assoc-ref %build-inputs "icecat") > + (string-append datadir > + "/application.ini")))) > + (chmod launcher #o555))))))) In the phase above, instead of using %output and %build-inputs, please change "lambda _" to "lambda* (#:key inputs outputs #:allow-other-keys)" and then extract the data from 'inputs' and 'outputs'. Otherwise it looks good to me. Thanks! Mark