cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #160475: mariadb: Fix Darwin build

Browse source
This commit is contained in:
Vladimír Čunát 2022-02-17 19:05:51 +01:00
commit a9d2261b0e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/sql/mariadb/default.nix
View file

@ -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 ]);