darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

disable openssl legacy provider on ssl 1.1

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-30 17:32:16 +01:00
parent 4b74c48cad
commit f6f65b1de1
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
akkoma/admin-fe/default.nix
View file

@ -14,6 +14,7 @@
python3, python3,
libsass, libsass,
pkg-config, pkg-config,
callPackage,
}: let }: let
source = builtins.fromJSON (builtins.readFile ./source.json); source = builtins.fromJSON (builtins.readFile ./source.json);
src = applyPatches { src = applyPatches {
@ -25,10 +26,7 @@
}; };
patches = [./admin-fe.patch]; patches = [./admin-fe.patch];
}; };
nodeOptions = nodeOptions = callPackage ../../lib/opensslLegacyProvider.nix {};
if builtins.compareVersions nodejs.version "18" >= 0
then "--openssl-legacy-provider"
else "";
in in
mkYarnPackage rec { mkYarnPackage rec {
pname = "admin-fe"; pname = "admin-fe";

6
akkoma/pleroma-fe/default.nix
View file

@ -11,6 +11,7 @@
nodePackages, nodePackages,
writeScript, writeScript,
applyPatches, applyPatches,
callPackage,
}: let }: let
source = builtins.fromJSON (builtins.readFile ./source.json); source = builtins.fromJSON (builtins.readFile ./source.json);
src = applyPatches { src = applyPatches {
@ -22,10 +23,7 @@
}; };
patches = [./pleroma-fe.patch]; patches = [./pleroma-fe.patch];
}; };
nodeOptions = nodeOptions = callPackage ../../lib/opensslLegacyProvider.nix {};
if builtins.compareVersions nodejs.version "18" >= 0
then "--openssl-legacy-provider"
else "";
in in
mkYarnPackage rec { mkYarnPackage rec {
pname = "pleroma-fe"; pname = "pleroma-fe";

1
lib/default.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
mkPleromaEmoji = pkgs.callPackage ./mkPleromaEmoji.nix {}; mkPleromaEmoji = pkgs.callPackage ./mkPleromaEmoji.nix {};
gradleDeps = pkgs.callPackage ./gradleDeps.nix {}; gradleDeps = pkgs.callPackage ./gradleDeps.nix {};
opensslLegacyProvider = pkgs.callPackage ./opensslLegacyProvider.nix {};
} }

7
lib/opensslLegacyProvider.nix Normal file
View 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 ""