diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-04-17 22:16:24 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-04-17 22:16:24 +0300 |
| commit | 0b3827d04a18013aafcee0dc18f68e6b916d4d55 (patch) | |
| tree | 4199b108a72c01621636539a2be4ddea3a7080e5 /pkgs/servers/sql | |
| parent | cd8b383f62ec183347fb8fa374e3af135cfef5c0 (diff) | |
| parent | 437468d5ea0d66d4400b178883389be4adabd3da (diff) | |
| download | nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.tar nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.tar.gz nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.tar.bz2 nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.tar.lz nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.tar.xz nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.tar.zst nixpkgs-0b3827d04a18013aafcee0dc18f68e6b916d4d55.zip | |
Merge pull request #14772 from cleverca22/mariadb
mariadb: fix arm builds
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 370abd376ad..c8f25b6f09d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { # temporary due to https://mariadb.atlassian.net/browse/MDEV-9000 (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.isLinux [ jemalloc libaio systemd ] + ++ stdenv.lib.optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; |