mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-11-03 11:20:09 +00:00
percona-xtrabackup: fix build with GCC16
Also unbundle more libraries
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ callPackage, ... }@args:
|
||||
{ callPackage, fetchpatch, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (
|
||||
args
|
||||
@@ -10,6 +10,18 @@ callPackage ./generic.nix (
|
||||
fetchSubmodules = true;
|
||||
|
||||
extraPatches = [
|
||||
# Fix build with GCC16
|
||||
(fetchpatch {
|
||||
url = "https://github.com/percona/percona-xtrabackup/commit/024437d597e92c950faa4efa59429ee2e801dd58.patch";
|
||||
hash = "sha256-BRVDDgaiekCJ5OMdzh5O1FIOn+ACor2HilK3gt3Jw94=";
|
||||
excludes = [
|
||||
"router/src/mysql_rest_service/src/mrs/authentication/helper/scram.h"
|
||||
];
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/percona/percona-xtrabackup/commit/c03c65750311b84167652a211b8f7ac50b68de9b.patch";
|
||||
hash = "sha256-MIMY5BavSYpiCXiSVT4PoVpCgf30ve17Z2oXLGs1d8Y=";
|
||||
})
|
||||
];
|
||||
|
||||
extraPostInstall = "";
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
libgcrypt,
|
||||
libgpg-error,
|
||||
lz4,
|
||||
icu,
|
||||
ncurses,
|
||||
numactl,
|
||||
openssl,
|
||||
@@ -24,6 +25,7 @@
|
||||
valgrind,
|
||||
xxd,
|
||||
zlib,
|
||||
zstd,
|
||||
perlPackages,
|
||||
version,
|
||||
hash,
|
||||
@@ -32,7 +34,6 @@
|
||||
extraPostInstall ? "",
|
||||
...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "percona-xtrabackup";
|
||||
inherit version;
|
||||
@@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libgcrypt
|
||||
libgpg-error
|
||||
lz4
|
||||
icu
|
||||
ncurses
|
||||
numactl
|
||||
openssl
|
||||
@@ -70,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
valgrind
|
||||
xxd
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ (with perlPackages; [
|
||||
perl
|
||||
@@ -86,12 +89,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DWITH_BOOST=system"
|
||||
"-DWITH_CURL=system"
|
||||
"-DWITH_EDITLINE=system"
|
||||
"-DWITH_ICU=system"
|
||||
"-DWITH_LIBEVENT=system"
|
||||
"-DWITH_LZ4=system"
|
||||
"-DWITH_PROTOBUF=system"
|
||||
"-DWITH_SASL=system"
|
||||
"-DWITH_SSL=system"
|
||||
"-DWITH_ZLIB=system"
|
||||
"-DWITH_ZSTD=system"
|
||||
"-DWITH_VALGRIND=ON"
|
||||
"-DWITH_MAN_PAGES=OFF"
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user