mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
Merge pull request #23218 from johbo/darwin-mysql
mysql57: Add developer_cmds as build input on darwin
This commit is contained in:
commit
3540c139b9
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
|
||||
, boost, cctools, CoreServices }:
|
||||
, boost, cctools, CoreServices, developer_cmds }:
|
||||
|
||||
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake bison ncurses openssl readline zlib boost ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ];
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -10620,7 +10620,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin) cctools developer_cmds;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
boost = boost159;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user