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

Merge pull request #11029 from ryantrinkle/mariadb-darwin

Browse Source 
Add CoreServices framework dependency to mariadb on darwin
This commit is contained in:
Arseniy Seroka 2015-11-16 18:28:23 +03:00
commit 855cba7da7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/mariadb/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy { stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
, openssl, pcre, boost, judy, bison, libxml2 , openssl, pcre, boost, judy, bison, libxml2
, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools , fixDarwinDylibNames, cctools, CoreServices
}: }:
with stdenv.lib; with stdenv.lib;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
(if stdenv.is64bit then snappy else null) (if stdenv.is64bit then snappy else null)
pcre libxml2 boost judy bison libevent cracklib pcre libxml2 boost judy bison libevent cracklib
] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ] ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools ]; ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch;

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

@ -9282,6 +9282,7 @@ let
mariadb = callPackage ../servers/sql/mariadb { mariadb = callPackage ../servers/sql/mariadb {
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
}; };
mongodb = callPackage ../servers/nosql/mongodb { mongodb = callPackage ../servers/nosql/mongodb {