public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mysql*: fix build w/glibc-2.32

Browse Source
This commit is contained in:
Maximilian Bosch 2020-08-11 13:12:58 +02:00
parent 39268ecf39
commit 1897ff96d3
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, cmake, bison, pkgconfig { stdenv, fetchurl, cmake, bison, pkgconfig
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
, cctools, CoreServices, developer_cmds }: , cctools, CoreServices, developer_cmds
, libtirpc, rpcsvc-proto
}:
# Note: zlib is not required; MySQL can use an internal zlib. # Note: zlib is not required; MySQL can use an internal zlib.
@ -19,9 +21,9 @@ self = stdenv.mkDerivation rec {
export PATH=$PATH:$TMPDIR export PATH=$PATH:$TMPDIR
''; '';
nativeBuildInputs = [ cmake bison pkgconfig ]; nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ];
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
outputs = [ "out" "static" ]; outputs = [ "out" "static" ];

6
pkgs/servers/sql/mysql/8.0.x.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, bison, cmake, pkgconfig { lib, stdenv, fetchurl, bison, cmake, pkgconfig
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib
, numactl, perl, cctools, CoreServices, developer_cmds , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto
}: }:
let let
@ -18,12 +18,12 @@ self = stdenv.mkDerivation rec {
./libutils.patch ./libutils.patch
]; ];
nativeBuildInputs = [ bison cmake pkgconfig ]; nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ];
buildInputs = [ buildInputs = [
boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
numactl numactl libtirpc
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
cctools CoreServices developer_cmds cctools CoreServices developer_cmds
]; ];