mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 01:43:36 +01:00
Code Issues Projects Releases Wiki Activity

build: Exclude python plugins from flake build

Browse Source
This commit is contained in:
Joseph Goulden 2024-09-30 16:33:53 +01:00 committed by Vincenzo Palazzo
parent 864ece025e
commit fe7168b335
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
24.08
24.08.1

6
nix/pkgs/default.nix
View File

@ -8,8 +8,8 @@ with pkgs;
let
version = builtins.readFile ../../.version;
py3 = python3.withPackages (p: [
p.mako
p.grpcio-tools
p.mako
]);
in
stdenv.mkDerivation {
@ -19,6 +19,7 @@ stdenv.mkDerivation {
makeFlags = [
"VERSION=${version}"
"MTIME=${self.lastModifiedDate}"
"NO_PYTHON=1"
];
# when building on darwin we need cctools to provide the correct libtool
@ -33,6 +34,7 @@ stdenv.mkDerivation {
gitMinimal
libtool
lowdown
pkgconf
py3
unzip
which
@ -79,9 +81,7 @@ stdenv.mkDerivation {
stdenv.isDarwin && stdenv.isx86_64
) "-Wno-error=gnu-folding-constant";
# The `clnrest` plugin requires a Python environment to run
postInstall = ''
rm -r $out/libexec/c-lightning/plugins/clnrest
cp ${config.packages.rust}/bin/cln-grpc $out/libexec/c-lightning/plugins
'';

1
nix/shells.nix
View File

@ -9,6 +9,7 @@
}:
{
devShells = {
default = pkgs.mkShell { inputsFrom = [ config.packages.default ]; };
rust = pkgs.craneLib.devShell {
checks = {
inherit (self.checks.${system}) rust;

4
plugins/Makefile
View File

@ -114,9 +114,11 @@ C_PLUGINS := \
plugins/spenderp \
plugins/cln-askrene
ifneq ($(NO_PYTHON), 1)
PY_PLUGINS := \
plugins/clnrest/clnrest \
plugins/wss-proxy/wss-proxy
endif
ifeq ($(HAVE_SQLITE3),1)
C_PLUGINS += plugins/sql
@ -216,7 +218,7 @@ plugins/txprepare: $(PLUGIN_TXPREPARE_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_O
plugins/bcli: $(PLUGIN_BCLI_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)
plugins/keysend: wire/tlvstream.o wire/onion_wiregen.o $(PLUGIN_KEYSEND_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o common/sciddir_or_pubkey.o
plugins/keysend: wire/tlvstream.o wire/onion_wiregen.o $(PLUGIN_KEYSEND_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o common/sciddir_or_pubkey.o
$(PLUGIN_KEYSEND_OBJS): $(PLUGIN_PAY_LIB_HEADER)
plugins/spenderp: bitcoin/block.o bitcoin/preimage.o bitcoin/psbt.o common/psbt_open.o common/json_channel_type.o common/channel_type.o common/features.o wire/peer_wiregen.o $(PLUGIN_SPENDER_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)