From 000522dbf4839dc956e62dfc9a374c713069fe7a Mon Sep 17 00:00:00 2001 From: eth3lbert Date: Wed, 6 Dec 2023 09:26:29 +0800 Subject: [PATCH] Revert "pgroonga: build groonga with msgpack-c" This reverts commit 234b6136566eb37342fd02af9493041b7bfa01d6. Based on the discussion and upstream documentation, it seems more reasonable to add msgpack as a default dependency for groonga. --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 78dd305c98d6..bb0f33490b7e 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -10,17 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - let - groonga-with-msgpack = groonga.overrideAttrs (oa: { - buildInputs = oa.buildInputs ++ [ msgpack-c ]; - }); - in - [ - postgresql - msgpack-c - groonga-with-msgpack - ]; + buildInputs = [ postgresql msgpack-c groonga ]; makeFlags = [ "HAVE_MSGPACK=1"