diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-27 06:05:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 06:05:54 +0000 |
| commit | 92003c2ff7446e24895d33c12d35a4f2573ed384 (patch) | |
| tree | 91370fa386005b421b4fe9a17305560669ca5a24 /pkgs/development/libraries/openssl | |
| parent | 2ca83417c667f1ade1086cc5f67138b861b288fa (diff) | |
| parent | e329a8885794b2d96f28265575ab226bf4541481 (diff) | |
| download | nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.tar nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.tar.gz nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.tar.bz2 nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.tar.lz nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.tar.xz nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.tar.zst nixpkgs-92003c2ff7446e24895d33c12d35a4f2573ed384.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1c53a32a49e..a336dd18fae 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,7 +6,7 @@ # Used to avoid cross compiling perl, for example, in darwin bootstrap tools. # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. -, withPerl ? true +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform }: assert ( @@ -42,8 +42,10 @@ let substituteInPlace "$a" \ --replace /bin/rm rm done - '' + optionalString (versionAtLeast version "1.1.1") '' - substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env' + '' + # config is a configure script which is not installed. + + optionalString (versionAtLeast version "1.1.1") '' + substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ |