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

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

svn path=/nixpkgs/trunk/; revision=21867
This commit is contained in:
Peter Simons 2010-05-19 12:26:00 +00:00
parent 2508c95763
commit 3104ba89de

View file

@ -1361,12 +1361,10 @@ let
inherit fetchurl stdenv ncurses postgresql;
};
pdsh = import ../tools/networking/pdsh {
inherit fetchurl stdenv perl;
readline = if getPkgConfig "pdsh" "readline" true then readline else null;
rsh = getPkgConfig "pdsh" "rsh" true;
ssh = if getPkgConfig "pdsh" "ssh" true then openssh else null;
pam = if getPkgConfig "pdsh" "pam" true then pam else null;
pdsh = makeOverridable (import ../tools/networking/pdsh) {
inherit fetchurl stdenv perl readline pam;
rsh = true; # enable internal rsh implementation
ssh = openssh;
};
pfstools = import ../tools/graphics/pfstools {