From d22b66cffc5f6d5b946c24b04f782cbe3e11748a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 08:53:58 +0000 Subject: [PATCH] pkgs/top-level/all-packages.nix: added ikiwiki.{git,monotone} options to $NIXPKGS_CONFIG Set "ikiwiki = { git = true; monotone = true; };" in $NIXPKGS_CONFIG to enable support for git and monotone in ikiwiki. If left unconfigured, the default is to include support for git, but not for monotone. svn path=/nixpkgs/trunk/; revision=21415 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18b90e1cbbc..d16fd196735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7653,8 +7653,8 @@ let inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext; - inherit git; # The RCS should be optional - monotone = null; + git = if getPkgConfig "ikiwiki" "git" true then git else null; + monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; extraUtils = []; };