Merge pull request #43983 from viric/coreutils_ssl_master

Openssl in coreutils makes *sum programs much faster (RFC)

1 files changed, 5 insertions, 5 deletions

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 589c58d0acc0..146b5b5110c1 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildPackages
-, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
+, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, openssl, gmp ? null
 , hostPlatform, buildPlatform
 , aclSupport ? false, acl ? null
 , attrSupport ? false, attr ? null
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "info" ];
 
   nativeBuildInputs = [ perl xz.bin ];
-  configureFlags =
-    optional (singleBinary != false)
+  configureFlags = [ "--with-openssl" ]
+    ++ optional (singleBinary != false)
       ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
     ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
     ++ optional withPrefix "--program-prefix=g"
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ];
 
 
-  buildInputs = [ gmp ]
+  buildInputs = [ gmp openssl ]
     ++ optional aclSupport acl
     ++ optional attrSupport attr
     ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ]   # due to patch
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   # Saw random failures like ‘help2man: can't get '--help' info from
   # man/sha512sum.td/sha512sum’.
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
   FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1";