diff options
author | Peter Simons <simons@cryp.to> | 2010-04-29 09:35:20 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-04-29 09:35:20 +0000 |
commit | 5e8a97a831509d2d37dbe8dcfb197912c9a31b42 (patch) | |
tree | 81acab7650d6c5c229b00f0c411dcceb401902e2 /pkgs | |
parent | d2160c4ad02f8520427f93155f14ab4869864522 (diff) | |
download | nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.tar nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.tar.gz nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.tar.bz2 nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.tar.lz nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.tar.xz nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.tar.zst nixlib-5e8a97a831509d2d37dbe8dcfb197912c9a31b42.zip |
pkgs/top-level/all-packages.nix: added RPC-XML support to ikiwiki
This is required for the 'rst' plugin and for non-perl plugin support in general. svn path=/nixpkgs/trunk/; revision=21421
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index fb7bf88ca9b2..13aa0895cbfd 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl, gettext, makeWrapper, lib, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, - CGISession, CGIFormBuilder, DBFile, LocaleGettext + CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple , git ? null , monotone ? null , extraUtils ? [] @@ -19,7 +19,8 @@ stdenv.mkDerivation { }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ] + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext + RpcXML XMLSimple ] ++ (lib.optional (monotone != null) monotone) ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8527c1e8a32..5d83b03a129d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7652,7 +7652,8 @@ let ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) { inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber - HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext; + HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext + RpcXML XMLSimple; git = if getPkgConfig "ikiwiki" "git" true then git else null; monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; extraUtils = []; |