diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 11:59:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 11:59:43 +0000 |
| commit | f762b50991f1434f2f449304d718d928a1b7b2f9 (patch) | |
| tree | efc00b1e7221b3b2c3560ca6d7bca5ce3fa36ff8 /pkgs/tools/networking | |
| parent | c13587d6b32bcb9fcbf4ccfc475f3ece1caa8357 (diff) | |
| parent | 4c02ccd10783eecef9f613d86ebf576cac851830 (diff) | |
| download | nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.tar nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.tar.gz nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.tar.bz2 nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.tar.lz nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.tar.xz nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.tar.zst nixpkgs-f762b50991f1434f2f449304d718d928a1b7b2f9.zip | |
* Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/pdsh/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/wget/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 7e60e60bfa3..81327c84bf5 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { + " " + (if readline == null then "--without-readline" else "--with-readline") + " " + (if ssh == null then "--without-ssh" else "--with-ssh") + " " + (if pam == null then "--without-pam" else "--with-pam") - + " " + (if rsh == null then "--without-rsh" else "--with-rsh") + + " " + (if rsh == false then "--without-rsh" else "--with-rsh") + " --with-dshgroups" + " --with-xcpu" + " --without-genders" diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 9ab6fbb8133..a4618a53452 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext}: +{stdenv, fetchurl, gettext, openssl ? null}: stdenv.mkDerivation rec { name = "wget-1.11.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1yr7w182n7lvkajvq07wnw65sw2vmxjkc3611kpc728vhvi54zwb"; }; - buildInputs = [gettext]; + buildInputs = [gettext openssl]; meta = { description = "A console downloading program. Has some features for mirroring sites."; |