diff options
| author | John Ericson <git@JohnEricson.me> | 2024-06-30 10:25:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-30 10:25:10 -0400 |
| commit | 7d138093a19e81268d304b2569a65620840962d1 (patch) | |
| tree | 45565d1f13d1d07363a38a27173f22581e98ad18 /pkgs/development/libraries | |
| parent | 0ccaf326caa8d8ec752bf9c02bf899b4b6648e09 (diff) | |
| parent | d41da41ee4f74fc39ba40ad50205f3400e026167 (diff) | |
Merge pull request #323430 from obsidiansystems/openbsd-pkg-fixes
bash, openssl: Fix OpenBSD build
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 361756f94ea90..981ab14ddcaaf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -143,6 +143,15 @@ let # trying to build binaries statically. ++ lib.optional static "no-ct" ++ lib.optional withZlib "zlib" + # /dev/crypto support has been dropped in OpenBSD 5.7. + # + # OpenBSD's ports does this too, + # https://github.com/openbsd/ports/blob/a1147500c76970fea22947648fb92a093a529d7c/security/openssl/3.3/Makefile#L25. + # + # https://github.com/openssl/openssl/pull/10565 indicated the + # intent was that this would be configured properly automatically, + # but that doesn't appear to be the case. + ++ lib.optional stdenv.hostPlatform.isOpenBSD "no-devcryptoeng" ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [ # This is necessary in order to avoid openssl adding -march # flags which ultimately conflict with those added by |