From 203a48eb836fb057a09f09d8a9e8b12c8b40411c Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 24 Jan 2025 10:26:36 -0800 Subject: [PATCH] packaging: add pkg-config dep on kj Since we include kj from a header, we need to add a dependency to force downstreams to also have it as a declared dependency or at least put it in their include dir paths. Given kj is what it is, this is basically unavoidable that this dependency is visible. Change-Id: Ia89a90f10ad8b821260db0d7fdc47aebda44e66a --- lix/lix-base.pc.in | 3 ++- perl/default.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lix/lix-base.pc.in b/lix/lix-base.pc.in index 58c6223f5..3e8422770 100644 --- a/lix/lix-base.pc.in +++ b/lix/lix-base.pc.in @@ -3,6 +3,7 @@ libdir=@libdir@ includedir=@includedir@ Name: Lix base -Description: Lix Package Manager (config.hh fixup) +Description: Lix Package Manager (base include dir) Version: @PACKAGE_VERSION@ +Requires: kj-async Cflags: -I${includedir} diff --git a/perl/default.nix b/perl/default.nix index ed2584c7f..a4c49017c 100644 --- a/perl/default.nix +++ b/perl/default.nix @@ -45,6 +45,8 @@ perl.pkgs.toPerlModule ( boost perlPackages.DBI perlPackages.DBDSQLite + # for kj-async + nix.passthru.capnproto-nix ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;