diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-29 14:02:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-29 14:02:24 -0400 |
commit | f86bbb218cacd968aecdd1374a42d23262c23d3b (patch) | |
tree | ee54e0ed2d7a07fbfdfb4cc5babbaa55cd47fb09 | |
parent | d147d457e5472ae53674636111e21f0d181fec6b (diff) | |
parent | 4b5fc2cfae20913472aceb0a08bda11c93d63578 (diff) | |
download | nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.tar nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.tar.gz nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.tar.bz2 nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.tar.lz nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.tar.xz nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.tar.zst nixlib-f86bbb218cacd968aecdd1374a42d23262c23d3b.zip |
Merge pull request #67694 from kisik21/redis-cross-compile-fixes
redis: Try to fix cross-compilation
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 20a6321e0a80..118edb60156d 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -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; |