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

Revert "Merge pull request #43983 from viric/coreutils_ssl_master"

Browse Source 
coreutils is part of stdenv, which doesn't allow openssl currently.

It's unclear that adding openssl to stdenv was intended,
but if it was it was not discussed or mentioned.

To unbreak "all the things", reverting until this
has been discussed and a proper fix has been put together.

This reverts commit df9f76c62d47e856afedb7e4d1b921e1000a8dc1, reversing
changes made to 585ded73298c0f74e4bed64a22367b9914f00f06.
This commit is contained in:
Will Dietz 2018-07-28 19:20:26 -05:00
parent 13df2522b4
commit 0eb13162f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, buildPackages
, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, openssl, gmp ? null
, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, 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 = [ "--with-openssl" ]
++ optional (singleBinary != false)
configureFlags =
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 openssl ]
buildInputs = [ gmp ]
++ optional aclSupport acl
++ optional attrSupport attr
++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch