From d6f364ca8c723dfd52d0063353e603f1f7bb6c9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Jul 2011 10:41:05 +0000 Subject: [PATCH] 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 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 48eb9ae888b..c76efc9d1c5 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -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