diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-10-16 08:38:25 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-10-16 08:38:25 +0000 |
| commit | 7d52bceffbe192c606e217d209873e867230daf8 (patch) | |
| tree | 7f2f57d0d62796b58c9578fbe3850a7c74daaf7f /pkgs | |
| parent | 8e9ea2c2093724532072d1fdf9da7f9fd3cb951a (diff) | |
Adding support of external utilities in ikiwiki
svn path=/nixpkgs/trunk/; revision=17845
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 69faf81122a3e..9092c08303c56 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 a97269eeadee6..115fd388d2574 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 { |