From 234b6136566eb37342fd02af9493041b7bfa01d6 Mon Sep 17 00:00:00 2001 From: eth3lbert Date: Tue, 5 Dec 2023 14:14:41 +0800 Subject: [PATCH 1/3] pgroonga: build groonga with msgpack-c pgroonga requires groonga with msgpack #272202. --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index bb0f33490b7e..78dd305c98d6 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -10,7 +10,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql msgpack-c groonga ]; + buildInputs = + let + groonga-with-msgpack = groonga.overrideAttrs (oa: { + buildInputs = oa.buildInputs ++ [ msgpack-c ]; + }); + in + [ + postgresql + msgpack-c + groonga-with-msgpack + ]; makeFlags = [ "HAVE_MSGPACK=1" From 000522dbf4839dc956e62dfc9a374c713069fe7a Mon Sep 17 00:00:00 2001 From: eth3lbert Date: Wed, 6 Dec 2023 09:26:29 +0800 Subject: [PATCH 2/3] 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" From 4e9985374e5da72fb07272c691233d31686acab9 Mon Sep 17 00:00:00 2001 From: eth3lbert Date: Wed, 6 Dec 2023 10:42:31 +0800 Subject: [PATCH 3/3] groonga: add msgpack-c as default dependency According to the upstream documentation: https://groonga.org/docs/install/debian.html#build-from-source, msgpack should be added as a dependency by default. --- pkgs/servers/search/groonga/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 49cc74bafc2a..0acb6e1cb564 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, cmake, fetchurl, kytea, mecab, pkg-config, rapidjson, testers, xxHash, zstd, postgresqlPackages -, suggestSupport ? false, zeromq, libevent, msgpack, openssl +{ lib, stdenv, cmake, fetchurl, kytea, msgpack-c, mecab, pkg-config, rapidjson, testers, xxHash, zstd, postgresqlPackages +, suggestSupport ? false, zeromq, libevent, openssl , lz4Support ? false, lz4 , zlibSupport ? true, zlib }: @@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { zstd mecab kytea + msgpack-c ] ++ lib.optionals lz4Support [ lz4 ] ++ lib.optional zlibSupport [ @@ -36,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals suggestSupport [ zeromq libevent - msgpack ]; env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include";