Merge pull request #188340 from squalus/redis

redis: fix cross compile
This commit is contained in:
adisbladis 2022-08-27 14:00:25 +08:00 committed by GitHub
commit 57f1997b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,17 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-8OZf2nTESj3U+p1RLU1Ngz3Qk5yTTpRqXGIqYw0Ffy8=";
};
# Cross-compiling fixes
configurePhase = ''
runHook preConfigure
${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)')
''}
runHook postConfigure
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lua ]