about summary refs log tree commit diff
path: root/pkgs/tools/misc/coreutils
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-07-28 19:20:26 -0500
committerWill Dietz <w@wdtz.org>2018-07-28 19:20:26 -0500
commit0eb13162f1873451a8269e7df1ef0c12c4379b16 (patch)
tree5f9a42d1ca462dae38b6902a4881c9a7289d538d /pkgs/tools/misc/coreutils
parent13df2522b417bb867b1e40704cd5bdda3cbf9bc2 (diff)
downloadnixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.tar
nixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.tar.gz
nixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.tar.bz2
nixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.tar.lz
nixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.tar.xz
nixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.tar.zst
nixlib-0eb13162f1873451a8269e7df1ef0c12c4379b16.zip
Revert "Merge pull request #43983 from viric/coreutils_ssl_master"
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.
Diffstat (limited to 'pkgs/tools/misc/coreutils')
-rw-r--r--pkgs/tools/misc/coreutils/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 1da6ec9b2251..589c58d0acc0 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, 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