diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-21 17:04:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 17:04:20 -0400 |
| commit | 916f096911162ea4c85f3fb2eed5af8785abf925 (patch) | |
| tree | 6d1a37cd15afb34dff9cb416ea99a39392ad513d /pkgs/development/libraries/openssl | |
| parent | e975814b19ba8cb8052a60f18de2ee4aebe1190b (diff) | |
| parent | b98b4eac71cfb0ccedc6d909fd58058bc1cb85e7 (diff) | |
| download | nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.gz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.bz2 nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.lz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.xz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.zst nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.zip | |
Merge pull request #43890 from matthewbauer/mingw-fixes
Mingw fixes
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index b4b932f8d058..b5b9ae766465 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -44,7 +44,9 @@ let if hostPlatform == buildPlatform then "./config" else if hostPlatform.isMinGW - then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" + then "./Configure mingw${optionalString + (hostPlatform.parsed.cpu.bits != 32) + (toString hostPlatform.parsed.cpu.bits)}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isiOS |