public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs-w3m: Get the source from CVS.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16323
This commit is contained in:
Ludovic Courtès 2009-07-10 16:01:50 +00:00
parent 099dd7fa16
commit 45f7159af3
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
View File

@ -1,14 +1,19 @@
{ fetchurl, stdenv, emacs, w3m, imagemagick, texinfo }: { fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
let date = "2009-07-09"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-w3m-1.4.4"; name = "emacs-w3m-cvs${date}";
src = fetchurl { # Get the source from CVS because the previous release (1.4.4) is old and
url = "http://emacs-w3m.namazu.org/${name}.tar.gz"; # doesn't work with GNU Emacs 23.
sha256 = "193p3kkjk1glhlgfqb9hz99av2i4b53civkz23ayvz3w9wvyird3"; src = fetchcvs {
inherit date;
cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
module = "emacs-w3m";
sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a";
}; };
buildInputs = [ emacs w3m texinfo ]; buildInputs = [ emacs w3m texinfo autoconf ];
# XXX: Should we do the same for xpdf/evince, gv, gs, etc.? # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
patchPhase = '' patchPhase = ''
@ -17,10 +22,11 @@ stdenv.mkDerivation rec {
s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g' s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g'
sed -i "w3m-image.el" \ sed -i "w3m-image.el" \
-e 's|defcustom w3m-imagick-convert-program.*$|defcustom w3m-imagick-convert-program "${imagemagick}/bin/convert"|g' -e 's|(w3m-which-command "convert")$|"${imagemagick}/bin/convert"|g'
''; '';
configurePhase = '' configurePhase = ''
autoreconf -vfi && \
./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \ ./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \
--with-icondir="$out/share/emacs/site-lisp/images/w3m" --with-icondir="$out/share/emacs/site-lisp/images/w3m"
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -6102,7 +6102,7 @@ let
emacsUnicode = emacs23; emacsUnicode = emacs23;
emacsw3m = import ../applications/editors/emacs-modes/emacs-w3m { emacsw3m = import ../applications/editors/emacs-modes/emacs-w3m {
inherit fetchurl stdenv emacs w3m imagemagick texinfo; inherit fetchcvs stdenv emacs w3m imagemagick texinfo autoconf;
}; };
emms = import ../applications/editors/emacs-modes/emms { emms = import ../applications/editors/emacs-modes/emms {