pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #11029 from ryantrinkle/mariadb-darwin

Add CoreServices framework dependency to mariadb on darwin

Arseniy Seroka 855cba7d aca33776

+3 -2
unified split
+2 -2
pkgs/servers/sql/mariadb/default.nix
··· 1 1 { stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy 2 2 , openssl, pcre, boost, judy, bison, libxml2 3 3 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl 4 - , fixDarwinDylibNames, cctools 4 + , fixDarwinDylibNames, cctools, CoreServices 5 5 }: 6 6 7 7 with stdenv.lib; ··· 20 20 (if stdenv.is64bit then snappy else null) 21 21 pcre libxml2 boost judy bison libevent cracklib 22 22 ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ] 23 - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools ]; 23 + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; 24 24 25 25 patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; 26 26
+1
pkgs/top-level/all-packages.nix
··· 9282 9282 9283 9283 mariadb = callPackage ../servers/sql/mariadb { 9284 9284 inherit (darwin) cctools; 9285 + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; 9285 9286 }; 9286 9287 9287 9288 mongodb = callPackage ../servers/nosql/mongodb {