From 56ab8201f25680cd7853f7617edcbf29cdcae059 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Oct 2009 11:58:07 +0000 Subject: pkgs/top-level/all-packages.nix: allow distcc to be configured via $NIXPKGS_CONFIG Set distcc = { avahi = true; gtk = true; }; to enable support for the corresponding libraries. svn path=/nixpkgs/trunk/; revision=18016 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1abd15aefe431..6f3d673e2325a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2696,8 +2696,10 @@ let }; distcc = import ../development/tools/misc/distcc { - inherit fetchurl stdenv popt avahi pkgconfig python; - inherit (gtkLibs) gtk; + inherit fetchurl stdenv popt python; + avahi = if getPkgConfig "distcc" "avahi" false then avahi else null; + pkgconfig = if getPkgConfig "distcc" "gtk" false then pkgconfig else null; + gtk = if getPkgConfig "distcc" "gtk" false then gtkLibs.gtk else null; }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { -- cgit 1.4.1