diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-22 09:28:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-22 09:28:53 +0200 |
| commit | c35938870eefb7fcbcc19fc053ee9956ead2c6b1 (patch) | |
| tree | d6b0062859feb7ead98e39003108549525b4b32d /pkgs | |
| parent | 4c8695f835cb2d7ea4be9a940becd6e6a2418710 (diff) | |
| download | nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.tar nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.tar.gz nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.tar.bz2 nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.tar.lz nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.tar.xz nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.tar.zst nixpkgs-c35938870eefb7fcbcc19fc053ee9956ead2c6b1.zip | |
Revert "openssl: switch to linux-x86 and linux-x86_64 targets"
Mass-rebuild and should go to staging instead. This reverts commit 4c8695f835cb2d7ea4be9a940becd6e6a2418710.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 6 |
1 files 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 = { - 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"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" |