diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-11-29 11:22:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-29 11:22:23 +0100 |
commit | a5b56b6ae8e15e5151e57e524b9f990cafd97e37 (patch) | |
tree | 58705c509e0f2cb8b9d86ec5c3315866b0d4b620 /pkgs | |
parent | c35d468fa80794b6e989b059369525875f49bd07 (diff) | |
parent | baf2814f48cfb2fec0a045722609bb2c659929d1 (diff) |
Merge pull request #99366 from Mic92/redis
redis: disable systemd in musl build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 2ca829b62b12..38e12010f416 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; |