colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support of external utilities in ikiwiki

Browse Source 
svn path=/nixpkgs/trunk/; revision=17845
This commit is contained in:
Michael Raskin 2009-10-16 08:38:25 +00:00
parent 8e9ea2c209
commit 7d52bceffb
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -3,6 +3,7 @@
CGISession, CGIFormBuilder, DBFile CGISession, CGIFormBuilder, DBFile
, git ? null , git ? null
, monotone ? null , monotone ? null
, extraUtils ? []
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -37,6 +38,7 @@ stdenv.mkDerivation {
''--prefix PATH : ${git}/bin \''} ''--prefix PATH : ${git}/bin \''}
${lib.optionalString (monotone != null) ${lib.optionalString (monotone != null)
''--prefix PATH : ${monotone}/bin \''} ''--prefix PATH : ${monotone}/bin \''}
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
done done
''; '';

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

@ -7134,6 +7134,7 @@ let
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder; HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder;
inherit git; # The RCS should be optional inherit git; # The RCS should be optional
monotone = null; monotone = null;
extraUtils = [];
}; };
imagemagick = import ../applications/graphics/ImageMagick { imagemagick = import ../applications/graphics/ImageMagick {