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

Revert "openssl: switch to linux-x86 and linux-x86_64 targets"

Browse Source 
Mass-rebuild and should go to staging instead.

This reverts commit 4c8695f835.
This commit is contained in:
Frederik Rietdijk 2019-10-22 09:28:53 +02:00
parent 4c8695f835
commit c35938870e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/openssl/default.nix
View File

@ -44,12 +44,10 @@ let
# TODO(@Ericson2314): Improve with mass rebuild # TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = []; configurePlatforms = [];
configureScript = { configureScript = {
x86_64-darwin = "./Configure darwin64-x86_64-cc";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; 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 ( }.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform if stdenv.hostPlatform == stdenv.buildPlatform
then "./config" then "./config"