From 5cc75bbb98cd5dc94be1dee3aba10547b62dbdd1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 1 Aug 2022 00:49:43 +0200 Subject: [PATCH] percona-xtrabackup_*: pin to openssl_1_1 --- pkgs/tools/backup/percona-xtrabackup/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 4caafcae679b..2ea2088645e4 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; buildInputs = [ - curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4 + (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4 ncurses numactl openssl protobuf valgrind xxd zlib ] ++ (with perlPackages; [ perl DBI DBDmysql ]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbcff8972bae..6d9583ea3018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9645,10 +9645,16 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix - { stdenv = gcc10StdenvCompat; boost = boost159; }; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix - { stdenv = gcc10StdenvCompat; boost = boost170; }; + percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { + stdenv = gcc10StdenvCompat; + boost = boost159; + openssl = openssl_1_1; + }; + percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { + stdenv = gcc10StdenvCompat; + boost = boost170; + openssl = openssl_1_1; + }; pick = callPackage ../tools/misc/pick { };