From e40a09e3ace41320ae49ea8109121385e7fb2659 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 15 Jul 2018 13:48:43 +0200 Subject: [PATCH] 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; };