From 5e8a97a831509d2d37dbe8dcfb197912c9a31b42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Apr 2010 09:35:20 +0000
Subject: [PATCH] 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
---
 pkgs/applications/misc/ikiwiki/default.nix | 5 +++--
 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 fb7bf88ca9b..13aa0895cbf 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 b8527c1e8a3..5d83b03a129 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 = [];