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

Merge pull request #46528 from markuskowa/pdsh-fix

Browse Source 
pdsh: set default module to ssh, remove obsolete fixes
This commit is contained in:
Matthew Bauer 2018-09-29 00:50:37 -05:00 committed by GitHub
commit a87c16bab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/networking/pdsh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, readline, rsh, ssh, pam }: { stdenv, fetchurl, perl, readline, rsh, ssh }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pdsh-2.33"; name = "pdsh-2.33";
@ -8,12 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k"; sha256 = "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k";
}; };
buildInputs = [perl readline ssh pam]; buildInputs = [ perl readline ssh ];
/* pdsh uses pthread_cancel(), which requires libgcc_s.so.1 to be
loadable at run-time. Adding the flag below ensures that the
library can be found. Obviously, though, this is a hack. */
NIX_LDFLAGS="-lgcc_s";
preConfigure = '' preConfigure = ''
configureFlagsArray=( configureFlagsArray=(
@ -22,11 +17,11 @@ stdenv.mkDerivation rec {
"--with-machines=/etc/pdsh/machines" "--with-machines=/etc/pdsh/machines"
${if readline == null then "--without-readline" else "--with-readline"} ${if readline == null then "--without-readline" else "--with-readline"}
${if ssh == null then "--without-ssh" else "--with-ssh"} ${if ssh == null then "--without-ssh" else "--with-ssh"}
${if pam == null then "--without-pam" else "--with-pam"}
${if rsh == false then "--without-rsh" else "--with-rsh"} ${if rsh == false then "--without-rsh" else "--with-rsh"}
"--with-dshgroups" "--with-dshgroups"
"--with-xcpu" "--with-xcpu"
"--disable-debug" "--disable-debug"
'--with-rcmd-rank-list=ssh,krb4,exec,xcpu,rsh'
) )
''; '';