diff options
author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2015-11-15 14:57:06 -0500 |
---|---|---|
committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2015-11-15 14:57:06 -0500 |
commit | 5d4595621d28ebcb6106b300488ac0f8b7a09a9d (patch) | |
tree | 1d58097eae715283a8a50e389cfabea75d465e97 /pkgs | |
parent | b0e253a05ce1f795c13c8d8c692ba93745ebd3b9 (diff) | |
download | nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.tar nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.tar.gz nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.tar.bz2 nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.tar.lz nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.tar.xz nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.tar.zst nixlib-5d4595621d28ebcb6106b300488ac0f8b7a09a9d.zip |
mariadb: fix missing CoreServices framework dependency on darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c758ef882696..1f281d9d72e3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl -, fixDarwinDylibNames, cctools +, fixDarwinDylibNames, cctools, CoreServices }: with stdenv.lib; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if stdenv.is64bit then snappy else null) pcre libxml2 boost judy bison libevent cracklib ] ++ 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc912375cbc8..f9a31c2856ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9277,6 +9277,7 @@ let mariadb = callPackage ../servers/sql/mariadb { inherit (darwin) cctools; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; mongodb = callPackage ../servers/nosql/mongodb { |