From c35938870eefb7fcbcc19fc053ee9956ead2c6b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 22 Oct 2019 09:28:53 +0200
Subject: [PATCH] Revert "openssl: switch to linux-x86 and linux-x86_64
 targets"

Mass-rebuild and should go to staging instead.

This reverts commit 4c8695f835cb2d7ea4be9a940becd6e6a2418710.
---
 pkgs/development/libraries/openssl/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7a1ef557469..0b026ae75f4 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -44,12 +44,10 @@ let
     # TODO(@Ericson2314): Improve with mass rebuild
     configurePlatforms = [];
     configureScript = {
+        x86_64-darwin  = "./Configure darwin64-x86_64-cc";
+        x86_64-solaris = "./Configure solaris64-x86_64-gcc";
         armv6l-linux = "./Configure linux-armv4 -march=armv6";
         armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
-        i686-linux = "./Configure linux-x86";
-        x86_64-darwin  = "./Configure darwin64-x86_64-cc";
-        x86_64-linux = "./Configure linux-x86_64";
-        x86_64-solaris = "./Configure solaris64-x86_64-gcc";
       }.${stdenv.hostPlatform.system} or (
         if stdenv.hostPlatform == stdenv.buildPlatform
           then "./config"