Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkgsStatic: make OpenSSL 1.1 compile #77542

Merged
merged 3 commits into from Jan 16, 2020
Merged

pkgsStatic: make OpenSSL 1.1 compile #77542

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4225eb1
pkgsStatic: make OpenSSL 1.1 compile
anmonteiro Jan 11, 2020
5b5b1b7
Add comments (code review)
anmonteiro Jan 12, 2020
e15901b
Move `no-shared` to the openssl derivation
anmonteiro Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions pkgs/top-level/static.nix
View file
Open in desktop
Expand Up @@ -161,14 +161,15 @@ 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.
# Instead, there's a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list.
configureFlags = (removeUnknownConfigureFlags o.configureFlags) ++ [
"no-shared"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we move this into the openssl expression and add it in case static == true

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @FRidh, thanks for your review. That does make sense, as with all the other derivations.

I (obviously) missed that when porting over from my own overlay. Just pushed a new commit that moves the static configuration to the openssl derivation.

];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please explain the rationale of the above with comments, otherwise others will just find unexplained magic incantations :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense, done in a new commit!

});
arrow-cpp = super.arrow-cpp.override {
enableShared = false;
python = { pkgs = { python = null; numpy = null; }; };
Expand Down