nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: fix build on non-x86_64 linux

Browse Source 
pmdk is only available on x86_64-linux, yet included in other platforms.

Things tested:
 - build on x86_64-linux is the same (substituted from binary cache)
 - build on aarch64-linux doesn't crash now with an "unsupported system"

(cherry picked from commit ccb2baa615)
This commit is contained in:
Vika Shleina
2021-11-24 02:07:30 +03:00
committed by github-actions[bot]
parent 036895751d
commit 7eefdd54ad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/sql/mariadb/default.nix
View File

@@ -164,7 +164,8 @@ server = stdenv.mkDerivation (common // {
bzip2 lz4 lzo snappy xz zstd
cracklib judy libevent libxml2
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
++ optionals stdenv.hostPlatform.isLinux [ linux-pam pmdk.dev ]
++ optionals stdenv.hostPlatform.isLinux [ linux-pam ]
++ optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv
++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ];