chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkgs/top-level/all-packages.nix: added RPC-XML support to ikiwiki

Browse Source 
This is required for the 'rst' plugin and for non-perl plugin support in
general.

From trunk@21421

svn path=/nixpkgs/branches/mass-update-01/; revision=21507
This commit is contained in:
Yury G. Kudryashov
2010-05-01 16:12:15 +00:00
parent b710d9ae33
commit c1351b46f3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
;

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

@@ -7663,7 +7663,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 = [];