From 36701d4af71bea5d042128effa4f665d28ee403a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Jul 2018 21:33:16 +0200 Subject: [PATCH 1/2] Openssl in coreutils makes *sum programs much faster. sha256sum, md5sum, etc. --- pkgs/tools/misc/coreutils/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 589c58d0acc..d904cbcd449 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages , autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, openssl ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = - optional (singleBinary != false) + configureFlags = optional (openssl != null) "--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 +50,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 +72,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"; From 322b2043f92b00a74246772349fd03c6c3513a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 28 Jul 2018 19:30:54 +0200 Subject: [PATCH 2/2] Remove default for openssl Suggested by matthewbauer review. --- pkgs/tools/misc/coreutils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d904cbcd449..146b5b5110c 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, buildPackages -, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null -, openssl ? null +, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, openssl, gmp ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = optional (openssl != null) "--with-openssl" + configureFlags = [ "--with-openssl" ] ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no"