public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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.

svn path=/nixpkgs/trunk/; revision=21421
This commit is contained in:
Peter Simons 2010-04-29 09:35:20 +00:00
parent d2160c4ad0
commit 5e8a97a831
2 changed files with 5 additions and 3 deletions
Show Stats 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, {stdenv, fetchurl, perl, gettext, makeWrapper, lib,
TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
CGISession, CGIFormBuilder, DBFile, LocaleGettext CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
, git ? null , git ? null
, monotone ? null , monotone ? null
, extraUtils ? [] , extraUtils ? []
@ -19,7 +19,8 @@ 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 ]
++ ++
(lib.optional (monotone != null) monotone) (lib.optional (monotone != null) monotone)
; ;

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

@ -7652,7 +7652,8 @@ let
ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) { ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) {
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;
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 = [];