mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Making ikiwiki happier with LocaleGettext
svn path=/nixpkgs/trunk/; revision=20845
This commit is contained in:
parent
acb93ad638
commit
946ca82173
2 changed files with 3 additions and 3 deletions
|
@ -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
|
CGISession, CGIFormBuilder, DBFile, LocaleGettext
|
||||||
, git ? null
|
, git ? null
|
||||||
, monotone ? null
|
, monotone ? null
|
||||||
, extraUtils ? []
|
, extraUtils ? []
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||||
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ]
|
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ]
|
||||||
++
|
++
|
||||||
(lib.optional (monotone != null) monotone)
|
(lib.optional (monotone != null) monotone)
|
||||||
;
|
;
|
||||||
|
|
|
@ -7580,7 +7580,7 @@ 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;
|
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext;
|
||||||
inherit git; # The RCS should be optional
|
inherit git; # The RCS should be optional
|
||||||
monotone = null;
|
monotone = null;
|
||||||
extraUtils = [];
|
extraUtils = [];
|
||||||
|
|
Loading…
Reference in a new issue