diff options
| author | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-05 19:30:59 +0200 |
|---|---|---|
| committer | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-05 19:30:59 +0200 |
| commit | 705afbd338e26b486aaacc237ee4fffbf9759b21 (patch) | |
| tree | 5c69ce5ff8d77f023b12dcbea6b6d3a4d68e982b /pkgs/servers/sql/mariadb/default.nix | |
| parent | c99a5b9a60ae5c5204a3f41f5d65b642093d1b82 (diff) | |
| parent | 94982e6f874ec52eaf3fed29c8d229cdc1f8bc2c (diff) | |
| download | nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.gz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.bz2 nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.lz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.xz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.zst nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.zip | |
Merge branch 'master' into package-petsc-p4est
Diffstat (limited to 'pkgs/servers/sql/mariadb/default.nix')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index db588b3abe0..64f603a4f07 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -4,7 +4,7 @@ , bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support -, withStorageMroonga ? true, kytea, msgpack, zeromq +, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -155,7 +155,7 @@ server = stdenv.mkDerivation (common // { bzip2 lz4 lzo snappy xz zstd libxml2 judy libevent cracklib ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals withStorageMroonga [ kytea msgpack zeromq ] + ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; |