ikiwiki: removed unconditional dependencies on monotone and git

Both build inputs 'monotone' and 'git' are non-null in nixpkgs, so their
respective store paths were always included in the generated wrapper
script -- even if 'monotoneSupport' and 'gitSupport' were false.

svn path=/nixpkgs/trunk/; revision=27746
This commit is contained in:
Peter Simons 2011-07-13 10:41:05 +00:00
parent 7c8871512d
commit d6f364ca8c

View file

@ -44,9 +44,9 @@ stdenv.mkDerivation {
postInstall = ''
for a in "$out/bin/"*; do
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
${lib.optionalString (git != null)
${lib.optionalString gitSupport
''--prefix PATH : ${git}/bin \''}
${lib.optionalString (monotone != null)
${lib.optionalString monotoneSupport
''--prefix PATH : ${monotone}/bin \''}
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
done