From e080690c2e5ce9af51e60e146a8c4702880daa60 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Sun, 11 Sep 2022 09:23:16 +0100 Subject: [PATCH] nix: remove ERR_error_string patch --- flake.nix | 1 - scripts/nix/direct-sqlcipher-err-string.patch | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 scripts/nix/direct-sqlcipher-err-string.patch diff --git a/flake.nix b/flake.nix index 0427d1ce7b..056735f4a4 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-2.3.27.patch ./scripts/nix/direct-sqlcipher-android.patch - ./scripts/nix/direct-sqlcipher-err-string.patch ]; packages.entropy.patches = [ ./scripts/nix/entropy.patch ]; } diff --git a/scripts/nix/direct-sqlcipher-err-string.patch b/scripts/nix/direct-sqlcipher-err-string.patch deleted file mode 100644 index c12c729acb..0000000000 --- a/scripts/nix/direct-sqlcipher-err-string.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cbits/sqlite3.c b/cbits/sqlite3.c -index 66bb609..ca32723 100644 ---- a/cbits/sqlite3.c -+++ b/cbits/sqlite3.c -@@ -105731,7 +105731,7 @@ static unsigned int openssl_init_count = 0; - static void sqlcipher_openssl_log_errors() { - unsigned long err = 0; - while((err = ERR_get_error()) != 0) { -- sqlcipher_log(SQLCIPHER_LOG_ERROR, "sqlcipher_openssl_log_errors: ERR_get_error() returned %lx: %s", err, ERR_error_string(err, NULL)); -+ sqlcipher_log(SQLCIPHER_LOG_ERROR, "sqlcipher_openssl_log_errors: ERR_get_error() returned %lx: %s", err, ERR_func_error_string(err)); - } - }