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

mysql: fix building on Apple Silicon 

rpcsvc-proto doesn't build for aarch64-darwin (`struct stat64` isn't
declared), but it isn't actually necessary on Darwin/clang.
This commit is contained in:
Jonathan del Strother 2021-04-11 12:50:09 +01:00
parent baf5e666c6
commit 9c76b17933
No known key found for this signature in database
GPG Key ID: 39C57B40653AA4FB
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,8 @@ self = stdenv.mkDerivation rec {
export PATH=$PATH:$TMPDIR export PATH=$PATH:$TMPDIR
''; '';
nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ] ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]

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

@ -17,7 +17,8 @@ self = stdenv.mkDerivation rec {
./abi-check.patch ./abi-check.patch
]; ];
nativeBuildInputs = [ bison cmake pkg-config rpcsvc-proto ]; nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
postPatch = '' postPatch = ''