From 2d4e801866fd10f419e2e0650045d0c4996e71d1 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 25 Aug 2022 18:08:47 -0700 Subject: [PATCH] redis: fix cross compile Remove a past cross compilation fix that's now causing it to break. --- pkgs/servers/nosql/redis/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 7dc692e113cc..62975bdb1d9e 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -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 ]