disable openssl legacy provider on ssl 1.1
This commit is contained in:
parent
4b74c48cad
commit
f6f65b1de1
4 changed files with 12 additions and 8 deletions
|
@ -14,6 +14,7 @@
|
|||
python3,
|
||||
libsass,
|
||||
pkg-config,
|
||||
callPackage,
|
||||
}: let
|
||||
source = builtins.fromJSON (builtins.readFile ./source.json);
|
||||
src = applyPatches {
|
||||
|
@ -25,10 +26,7 @@
|
|||
};
|
||||
patches = [./admin-fe.patch];
|
||||
};
|
||||
nodeOptions =
|
||||
if builtins.compareVersions nodejs.version "18" >= 0
|
||||
then "--openssl-legacy-provider"
|
||||
else "";
|
||||
nodeOptions = callPackage ../../lib/opensslLegacyProvider.nix {};
|
||||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "admin-fe";
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
nodePackages,
|
||||
writeScript,
|
||||
applyPatches,
|
||||
callPackage,
|
||||
}: let
|
||||
source = builtins.fromJSON (builtins.readFile ./source.json);
|
||||
src = applyPatches {
|
||||
|
@ -22,10 +23,7 @@
|
|||
};
|
||||
patches = [./pleroma-fe.patch];
|
||||
};
|
||||
nodeOptions =
|
||||
if builtins.compareVersions nodejs.version "18" >= 0
|
||||
then "--openssl-legacy-provider"
|
||||
else "";
|
||||
nodeOptions = callPackage ../../lib/opensslLegacyProvider.nix {};
|
||||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "pleroma-fe";
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
mkPleromaEmoji = pkgs.callPackage ./mkPleromaEmoji.nix {};
|
||||
gradleDeps = pkgs.callPackage ./gradleDeps.nix {};
|
||||
opensslLegacyProvider = pkgs.callPackage ./opensslLegacyProvider.nix {};
|
||||
}
|
||||
|
|
7
lib/opensslLegacyProvider.nix
Normal file
7
lib/opensslLegacyProvider.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
openssl,
|
||||
nodejs,
|
||||
}:
|
||||
if builtins.compareVersions nodejs.version "18" >= 0 && builtins.compareVersions openssl.versions "3" >= 0
|
||||
then "--openssl-legacy-provider"
|
||||
else ""
|
Reference in a new issue