JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redis: Try to fix cross-compilation

Browse Source 
**Note**: This makes redis use libc malloc when cross-compiling to
ARM. This may or may not degrade performance.

The reason for this is vendored jemalloc with Redis' patches. The
makefile for deps has hardcoded configure flags for jemalloc, and as a
result, it is unable to cross-compile it.
This commit is contained in:
Vika 2019-08-29 17:12:06 +03:00
parent ff6b4b12b7
commit 4b5fc2cfae
No known key found for this signature in database
GPG Key ID: 5402B9B5497BACDB
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/servers/nosql/redis/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lua }:
{ stdenv, fetchurl, lua, jemalloc }:
stdenv.mkDerivation rec {
version = "5.0.5";
@ -9,8 +9,21 @@ stdenv.mkDerivation rec {
sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91";
};
# Cross-compiling fixes
configurePhase = ''
${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
# This fixes hiredis, which has the AR awkwardly coded.
# Probably a good candidate for a patch upstream.
makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)')
''}
'';
buildInputs = [ lua ];
makeFlags = "PREFIX=$(out)";
# 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.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc";
enableParallelBuilding = true;