From 2508c9576386b18586e6c444732cbf071c65f98a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 May 2010 12:25:57 +0000
Subject: [PATCH] pkgs/top-level/all-packages.nix: prefer makeOverridable over
 getPkgConfig to customize distcc

Changed 'distcc' expression to allow for argument overriding instead of relying
on getPkgConfig.

svn path=/nixpkgs/trunk/; revision=21866
---
 pkgs/top-level/all-packages.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30a3026df31..295e23559fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3095,13 +3095,10 @@ let
     inherit (xlibs) libX11 libXt;
   };
 
-  distcc = import ../development/tools/misc/distcc {
-    inherit fetchurl stdenv popt;
-    python = if getPkgConfig "distcc" "python" true then python else null;
-    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;
-    static = getPkgConfig "distcc" "static" false;
+  distcc = makeOverridable (import ../development/tools/misc/distcc) {
+    inherit fetchurl stdenv popt python avahi pkgconfig;
+    inherit (gtkLibs) gtk;
+    static = false;
   };
 
   docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {