diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-13 10:41:05 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-13 10:41:05 +0000 |
| commit | d6f364ca8c723dfd52d0063353e603f1f7bb6c9f (patch) | |
| tree | 73f240f2106e56dc1d3b6bb03a216275dc410f2c /pkgs/applications/misc/ikiwiki/default.nix | |
| parent | 7c8871512d1ffad407d2285c6d507e34be47ded3 (diff) | |
| download | nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.tar nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.tar.gz nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.tar.bz2 nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.tar.lz nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.tar.xz nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.tar.zst nixpkgs-d6f364ca8c723dfd52d0063353e603f1f7bb6c9f.zip | |
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
Diffstat (limited to 'pkgs/applications/misc/ikiwiki/default.nix')
| -rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 4 |
1 files 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 |