diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-02-17 19:05:51 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-02-17 19:05:51 +0100 |
| commit | a9d2261b0ebce48a313393c1767c75fbc2f1a74e (patch) | |
| tree | e05a5931ab5e8af02c409b2cc3422418d13e7230 /pkgs | |
| parent | c7fce036011abf4f580221bca5f57f133d8683e8 (diff) | |
| parent | 6f7baddf2f1c08f147cf91fa21f683bca9f6d761 (diff) | |
Merge #160475: mariadb: Fix Darwin build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1b8b1eb1108f0..dfaf64380a913 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,7 +5,7 @@ , curl, libiconv, ncurses, openssl, pcre, pcre2 , libkrb5, libaio, liburing, systemd , CoreServices, cctools, perl -, jemalloc, less +, jemalloc, less, libedit # Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 @@ -15,7 +15,7 @@ , withStorageRocks ? true }: -let # in mariadb # spans the whole file +let libExt = stdenv.hostPlatform.extensions.sharedLibrary; @@ -43,7 +43,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds ] ++ (packageSettings.extraBuildInputs or []) ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]); |