Author: simons
Date: Wed Jul 13 10:41:05 2011
New Revision: 27746
URL: https://svn.nixos.org/websvn/nix/?rev=27746&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix Wed Jul 13
09:56:58 2011 (r27745)
+++ nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix Wed Jul 13
10:41:05 2011 (r27746)
@@ -44,9 +44,9 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
