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

Merge pull request #43983 from viric/coreutils_ssl_master 

Openssl in coreutils makes *sum programs much faster (RFC)
This commit is contained in:
viric 2018-07-29 00:17:44 +02:00 committed by GitHub
parent 585ded7329 322b2043f9
commit df9f76c62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/coreutils/default.nix
View File

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