gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl_1_1: fix build after 3.0.19 patch update (#485055)

Browse Source
This commit is contained in:
Leona Maroni
2026-01-30 23:22:19 +00:00
committed by GitHub
parent 166dd6f002 61e7d035d3
commit 8564d174c3
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 329ef62..9a8df64 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
# ifndef OPENSSL_SYS_VMS
# define X509_CERT_AREA OPENSSLDIR
# define X509_CERT_DIR OPENSSLDIR "/certs"
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
# define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
# else
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 329ef62..9a8df64 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
# ifndef OPENSSL_SYS_VMS
# define X509_CERT_AREA OPENSSLDIR
# define X509_CERT_DIR OPENSSLDIR "/certs"
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
# define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
# else
pkgs/development/libraries/openssl/default.nix
+4 -1
View File
@@ -417,7 +417,10 @@ in
./1.1/nix-ssl-cert-file.patch
(
if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch
if stdenv.hostPlatform.isDarwin then
./1.1/use-etc-ssl-certs-darwin.patch
else
./1.1/use-etc-ssl-certs.patch
)
];
withDocs = true;