From 4d209dcb153a0679a8c38e2c359ec9d8cf9b61f8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 12 Jul 2018 16:08:13 +0300 Subject: [PATCH] percona-xtrabackup: 2.4.9 -> 2.4.12 --- .../backup/percona-xtrabackup/default.nix | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 6899ba88a22c..a1c53dcd97f8 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,41 +1,39 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, boost, bison, curl, ncurses, openssl, readline, xxd +, boost, bison, curl, ncurses, openssl, xxd , libaio, libev, libgcrypt, libgpgerror, libtool, zlib }: stdenv.mkDerivation rec { name = "percona-xtrabackup-${version}"; - version = "2.4.9"; + version = "2.4.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; rev = name; - sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4"; + sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost bison curl ncurses openssl readline xxd + boost bison curl ncurses openssl xxd libaio libev libgcrypt libgpgerror libtool zlib ]; cmakeFlags = [ "-DBUILD_CONFIG=xtrabackup_release" "-DINSTALL_MYSQLTESTDIR=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DWITH_BOOST=system" "-DWITH_SSL=system" "-DWITH_ZLIB=system" - "-DWITH_MECAB=system" - "-DWITH_EXTRA_CHARSETS=all" - "-DWITH_INNODB_MEMCACHED=1" "-DWITH_MAN_PAGES=OFF" - "-DWITH_HTML_DOCS=OFF" - "-DWITH_LATEX_DOCS=OFF" - "-DWITH_PDF_DOCS=OFF" ]; + postInstall = '' + rm -r "$out"/lib/plugin/debug + ''; + meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; homepage = http://www.percona.com/software/percona-xtrabackup; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a52db70835ff..74cdc46ff57f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4364,6 +4364,7 @@ with pkgs; pepper = callPackage ../tools/admin/salt/pepper { }; percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + stdenv = overrideCC stdenv gcc5; boost = boost159; };