From 4d209dcb153a0679a8c38e2c359ec9d8cf9b61f8 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Thu, 12 Jul 2018 16:08:13 +0300
Subject: [PATCH 1/2] 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 6899ba88a22..a1c53dcd97f 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 a52db70835f..74cdc46ff57 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;
   };
 

From e40a09e3ace41320ae49ea8109121385e7fb2659 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 15 Jul 2018 13:48:43 +0200
Subject: [PATCH 2/2] percona-xtrabackup: fix build with gcc7

---
 pkgs/tools/backup/percona-xtrabackup/default.nix | 1 +
 pkgs/top-level/all-packages.nix                  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index a1c53dcd97f..712d0af29a9 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     "-DWITH_SSL=system"
     "-DWITH_ZLIB=system"
     "-DWITH_MAN_PAGES=OFF"
+    "-DCMAKE_CXX_FLAGS=-std=gnu++03"
   ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74cdc46ff57..a52db70835f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4364,7 +4364,6 @@ with pkgs;
   pepper = callPackage ../tools/admin/salt/pepper { };
 
   percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup {
-    stdenv = overrideCC stdenv gcc5;
     boost = boost159;
   };