ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

pkgsStatic: make OpenSSL 1.1 compile (#77542)

Browse Source 
* pkgsStatic: make OpenSSL 1.1 compile
This commit is contained in:
Antonio Nuno Monteiro 2020-01-16 11:02:38 -08:00 committed by Frederik Rietdijk
parent 1177bce848
commit 4b34c18e31
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,11 @@ let
"-DHAVE_CRYPTODEV" "-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS" "-DUSE_CRYPTODEV_DIGESTS"
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"; ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
# OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list of configuration options.
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
makeFlags = [ makeFlags = [
"MANDIR=$(man)/share/man" "MANDIR=$(man)/share/man"

12
pkgs/top-level/static.nix
View File

@ -161,14 +161,10 @@ in {
}; };
mkl = super.mkl.override { enableStatic = true; }; mkl = super.mkl.override { enableStatic = true; };
nix = super.nix.override { withAWS = false; }; nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: {
openssl = super.openssl_1_0_2.override { # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
static = true; configureFlags = (removeUnknownConfigureFlags o.configureFlags);
});
# Don’t use new stdenv for openssl because it doesn’t like the
# --disable-shared flag
stdenv = super.stdenv;
};
arrow-cpp = super.arrow-cpp.override { arrow-cpp = super.arrow-cpp.override {
enableShared = false; enableShared = false;
python = { pkgs = { python = null; numpy = null; }; }; python = { pkgs = { python = null; numpy = null; }; };