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

Merge pull request from johbo/mysql55 

mysql55: Allow to build on darwin
This commit is contained in:
zimbatm 2016-03-21 17:39:45 +00:00
parent d55248f4b4 67b1acd989
commit 81af597030
2 changed files with 7 additions and 3 deletions
pkgs
servers/sql/mysql
5.5.x.nix
top-level
all-packages.nix

5
pkgs/servers/sql/mysql/5.5.x.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl }: { stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
, cctools, CoreServices }:
# Note: zlib is not required; MySQL can use an internal zlib. # Note: zlib is not required; MySQL can use an internal zlib.
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ cmake bison ncurses openssl readline zlib ] buildInputs = [ cmake bison ncurses openssl readline zlib ]
++ stdenv.lib.optional stdenv.isDarwin perl; ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ];
enableParallelBuilding = true; enableParallelBuilding = true;

5
pkgs/top-level/all-packages.nix
View File

@ -9811,7 +9811,10 @@ let
ps = procps; /* !!! Linux only */ ps = procps; /* !!! Linux only */
}; };
mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mysql = mariadb; mysql = mariadb;
libmysql = mysql.lib; libmysql = mysql.lib;