mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Code Issues Wiki Activity

Merge pull request #119133 from jdelStrother/mysql

Browse source 
mysql: fix building on Apple Silicon
This commit is contained in:
Sandro 2021-04-12 16:35:40 +02:00 committed by GitHub
parent 1a35ed1c7c 9c76b17933
commit a1db6dd4c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
'';
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 ]
++ 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
];
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.
postPatch = ''