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

pkgs/applications/misc/ikiwiki: added build input PerlMagick

Browse Source 
Without ImageMagick support, Ikiwiki cannot handle images.

svn path=/nixpkgs/trunk/; revision=21456
This commit is contained in:
Peter Simons 2010-04-30 10:49:43 +00:00
parent ccf9a368b3
commit 06f51c6e05
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, gettext, makeWrapper, lib, { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
, git ? null , git ? null
@ -20,10 +20,7 @@ stdenv.mkDerivation {
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple ] RpcXML XMLSimple PerlMagick git monotone];
++
(lib.optional (monotone != null) monotone)
;
patchPhase = '' patchPhase = ''
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man

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

@ -7670,7 +7670,7 @@ let
inherit fetchurl stdenv perl gettext makeWrapper lib; inherit fetchurl stdenv perl gettext makeWrapper lib;
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
RpcXML XMLSimple; RpcXML XMLSimple PerlMagick;
git = if getPkgConfig "ikiwiki" "git" true then git else null; git = if getPkgConfig "ikiwiki" "git" true then git else null;
monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null;
extraUtils = []; extraUtils = [];