From 3104ba89de3f8de577e633e12546e965317350f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:00 +0000 Subject: 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 --- pkgs/top-level/all-packages.nix | 10 ++++------ 1 file 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 { -- cgit 1.4.1