diff options
| author | Peter Simons <simons@cryp.to> | 2009-10-29 11:58:07 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2009-10-29 11:58:07 +0000 |
| commit | 56ab8201f25680cd7853f7617edcbf29cdcae059 (patch) | |
| tree | 866c003f30f020fb9dbf86b4043bfcc7dccd3357 | |
| parent | 96a32cffe20f326ccbf67e4d6c09ef82fc2579cb (diff) | |
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
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files 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) { |