diff options
author | Peter Simons <simons@cryp.to> | 2010-04-30 10:49:43 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-04-30 10:49:43 +0000 |
commit | 06f51c6e054b6eabf553f550099a17ae2c988280 (patch) | |
tree | f9ff066a3f52fcad6343043dff0f513097a86617 | |
parent | ccf9a368b3fa9984a5ddb81a46f7d270b616f6ad (diff) | |
download | nixlib-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
-rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 6 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf7c8983f907..993023fea17c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7670,7 +7670,7 @@ let inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple; + RpcXML XMLSimple PerlMagick; git = if getPkgConfig "ikiwiki" "git" true then git else null; monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; extraUtils = []; |