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

Emacs-w3m: Add ImageMagick as a build input.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16288
This commit is contained in:
Ludovic Courtès 2009-07-09 16:09:09 +00:00
parent 2caabd37e1
commit df646c8ae4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ fetchurl, stdenv, emacs, w3m, texinfo }: { fetchurl, stdenv, emacs, w3m, imagemagick, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-w3m-1.4.4"; name = "emacs-w3m-1.4.4";
@ -10,9 +10,14 @@ stdenv.mkDerivation rec {
buildInputs = [ emacs w3m texinfo ]; buildInputs = [ emacs w3m texinfo ];
# XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
patchPhase = '' patchPhase = ''
sed -i "w3m.el" \ sed -i "w3m.el" \
-e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g' -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ;
s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g'
sed -i "w3m-image.el" \
-e 's|defcustom w3m-imagick-convert-program.*$|defcustom w3m-imagick-convert-program "${imagemagick}/bin/convert"|g'
''; '';
configurePhase = '' configurePhase = ''

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

@ -6234,7 +6234,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 texinfo; inherit fetchurl stdenv emacs w3m imagemagick texinfo;
}; };
emms = import ../applications/editors/emacs-modes/emms { emms = import ../applications/editors/emacs-modes/emms {