From df646c8ae4b0f521a8dd332138e37b9176d360d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Jul 2009 16:09:09 +0000 Subject: [PATCH] Emacs-w3m: Add ImageMagick as a build input. svn path=/nixpkgs/trunk/; revision=16288 --- .../editors/emacs-modes/emacs-w3m/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 3a8e20d405d..dfc49d7a292 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, w3m, texinfo }: +{ fetchurl, stdenv, emacs, w3m, imagemagick, texinfo }: stdenv.mkDerivation rec { name = "emacs-w3m-1.4.4"; @@ -10,9 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ emacs w3m texinfo ]; + # XXX: Should we do the same for xpdf/evince, gv, gs, etc.? patchPhase = '' 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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 685fb98f718..4aa30a87c42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6234,7 +6234,7 @@ let emacsUnicode = emacs23; 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 {