diff options
author | Antonio Nuno Monteiro <anmonteiro@gmail.com> | 2020-01-16 11:02:38 -0800 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-01-16 20:02:38 +0100 |
commit | 4b34c18e310b3012c7c213713d6c27c5df0c2b14 (patch) | |
tree | e7bcb867f1d0d459b27891ad6b0b9466c7485a1e /pkgs/top-level/static.nix | |
parent | 1177bce848ae759a1fcc9afc2e135adaf41a092a (diff) | |
download | nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.tar nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.tar.gz nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.tar.bz2 nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.tar.lz nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.tar.xz nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.tar.zst nixlib-4b34c18e310b3012c7c213713d6c27c5df0c2b14.zip |
pkgsStatic: make OpenSSL 1.1 compile (#77542)
* pkgsStatic: make OpenSSL 1.1 compile
Diffstat (limited to 'pkgs/top-level/static.nix')
-rw-r--r-- | pkgs/top-level/static.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index da36ffda8642..3dd539e03a72 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -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; }; }; |