Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1177bce848ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b34c18e310b
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 16, 2020

  1. pkgsStatic: make OpenSSL 1.1 compile (#77542) 

    * pkgsStatic: make OpenSSL 1.1 compile
    @anmonteiro @FRidh
    anmonteiro authored and FRidh committed Jan 16, 2020
    Copy the full SHA
    4b34c18 View commit details
Showing with 9 additions and 9 deletions.
  1. +5 −1 pkgs/development/libraries/openssl/default.nix
  2. +4 −8 pkgs/top-level/static.nix
6 changes: 5 additions & 1 deletion pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,11 @@ let
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
] ++ 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 = [
"MANDIR=$(man)/share/man"
12 changes: 4 additions & 8 deletions pkgs/top-level/static.nix
View file
Original file line number Diff line number Diff line change
@@ -161,14 +161,10 @@ in {
};
mkl = super.mkl.override { enableStatic = true; };
nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile
openssl = super.openssl_1_0_2.override {
static = true;

# Don’t use new stdenv for openssl because it doesn’t like the
# --disable-shared flag
stdenv = super.stdenv;
};
openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: {
# OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
configureFlags = (removeUnknownConfigureFlags o.configureFlags);
});
arrow-cpp = super.arrow-cpp.override {
enableShared = false;
python = { pkgs = { python = null; numpy = null; }; };