From 946ca821732f14897f37791f0b4f4825336bf723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 28 Mar 2010 22:54:10 +0000 Subject: [PATCH] Making ikiwiki happier with LocaleGettext svn path=/nixpkgs/trunk/; revision=20845 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 56388e641e47..a05668d246f2 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 + CGISession, CGIFormBuilder, DBFile, LocaleGettext , git ? null , monotone ? null , extraUtils ? [] @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; 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) ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecc2642b403c..d43741cc4022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7580,7 +7580,7 @@ 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; + HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext; inherit git; # The RCS should be optional monotone = null; extraUtils = [];