diff options
author | Peter Simons <simons@cryp.to> | 2010-05-19 12:26:00 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-05-19 12:26:00 +0000 |
commit | 3104ba89de3f8de577e633e12546e965317350f3 (patch) | |
tree | ceaef5aab955c79a6c9366b5733793b45835130b | |
parent | 2508c9576386b18586e6c444732cbf071c65f98a (diff) | |
download | nixlib-3104ba89de3f8de577e633e12546e965317350f3.tar nixlib-3104ba89de3f8de577e633e12546e965317350f3.tar.gz nixlib-3104ba89de3f8de577e633e12546e965317350f3.tar.bz2 nixlib-3104ba89de3f8de577e633e12546e965317350f3.tar.lz nixlib-3104ba89de3f8de577e633e12546e965317350f3.tar.xz nixlib-3104ba89de3f8de577e633e12546e965317350f3.tar.zst nixlib-3104ba89de3f8de577e633e12546e965317350f3.zip |
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
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 295e23559fcb..d9606cadaaa1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |