From 7d52bceffbe192c606e217d209873e867230daf8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 16 Oct 2009 08:38:25 +0000
Subject: [PATCH] Adding support of external utilities in ikiwiki

svn path=/nixpkgs/trunk/; revision=17845
---
 pkgs/applications/misc/ikiwiki/default.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 69faf81122a3..9092c08303c5 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -3,6 +3,7 @@
   CGISession, CGIFormBuilder, DBFile
   , git ? null
   , monotone ? null
+  , extraUtils ? []
   }:
 
 stdenv.mkDerivation {
@@ -37,6 +38,7 @@ stdenv.mkDerivation {
         ''--prefix PATH : ${git}/bin \''}
       ${lib.optionalString (monotone != null) 
         ''--prefix PATH : ${monotone}/bin \''}
+      ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
 
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a97269eeadee..115fd388d257 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7134,6 +7134,7 @@ let
       HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder;
     inherit git; # The RCS should be optional
     monotone = null;
+    extraUtils = [];
   };
 
   imagemagick = import ../applications/graphics/ImageMagick {