public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize distcc

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

svn path=/nixpkgs/trunk/; revision=21866
This commit is contained in:
Peter Simons 2010-05-19 12:25:57 +00:00
parent 7f0dc973f4
commit 2508c95763
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/all-packages.nix
View File

@ -3095,13 +3095,10 @@ let
inherit (xlibs) libX11 libXt; inherit (xlibs) libX11 libXt;
}; };
distcc = import ../development/tools/misc/distcc { distcc = makeOverridable (import ../development/tools/misc/distcc) {
inherit fetchurl stdenv popt; inherit fetchurl stdenv popt python avahi pkgconfig;
python = if getPkgConfig "distcc" "python" true then python else null; inherit (gtkLibs) gtk;
avahi = if getPkgConfig "distcc" "avahi" false then avahi else null; static = false;
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;
}; };
docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {