cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

percona-xtrabackup_*: fix version test, cleanup

Browse source 
* Reorder `libevent` and `libev` in `buildInputs`. Otherwise, cmake
    picks up the wrong `event.h` and the version test for `libevent`
    fails.
  * Remove apparently obsolete workaround from fc8061dae4.
This commit is contained in:
Nicolas Benes 2022-10-17 21:50:51 +02:00
parent 965c7a6a58
commit 8eabf7a637
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/backup/percona-xtrabackup/generic.nix
View file

@ -19,17 +19,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
buildInputs = [
(curl.override { inherit openssl; }) cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4
(curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4
ncurses numactl openssl protobuf valgrind xxd zlib
] ++ (with perlPackages; [ perl DBI DBDmysql ]);
patches = extraPatches;
# Workaround build failure on -fno-common toolchains:
# ld: xbstream.c.o:(.bss+0x0): multiple definition of
# `datasink_buffer'; ds_buffer.c.o:(.data.rel.local+0x0): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
cmakeFlags = [
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DBUILD_CONFIG=xtrabackup_release"