about summary refs log tree commit diff
path: root/pkgs/applications/misc/ikiwiki/default.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2010-04-30 10:49:43 +0000
committerPeter Simons <simons@cryp.to>2010-04-30 10:49:43 +0000
commit06f51c6e054b6eabf553f550099a17ae2c988280 (patch)
treef9ff066a3f52fcad6343043dff0f513097a86617 /pkgs/applications/misc/ikiwiki/default.nix
parentccf9a368b3fa9984a5ddb81a46f7d270b616f6ad (diff)
downloadnixlib-06f51c6e054b6eabf553f550099a17ae2c988280.tar
nixlib-06f51c6e054b6eabf553f550099a17ae2c988280.tar.gz
nixlib-06f51c6e054b6eabf553f550099a17ae2c988280.tar.bz2
nixlib-06f51c6e054b6eabf553f550099a17ae2c988280.tar.lz
nixlib-06f51c6e054b6eabf553f550099a17ae2c988280.tar.xz
nixlib-06f51c6e054b6eabf553f550099a17ae2c988280.tar.zst
nixlib-06f51c6e054b6eabf553f550099a17ae2c988280.zip
pkgs/applications/misc/ikiwiki: added build input PerlMagick
Without ImageMagick support, Ikiwiki cannot handle images.

svn path=/nixpkgs/trunk/; revision=21456
Diffstat (limited to 'pkgs/applications/misc/ikiwiki/default.nix')
-rw-r--r--pkgs/applications/misc/ikiwiki/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 13aa0895cbfd..6e4617eb9f72 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, gettext, makeWrapper, lib,
+{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
   TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
   CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
   , git ? null
@@ -20,10 +20,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
     TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
-    RpcXML XMLSimple ]
-    ++
-    (lib.optional (monotone != null) monotone)
-    ;
+    RpcXML XMLSimple PerlMagick git monotone];
 
   patchPhase = ''
     sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man