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

1
nix/shells.nix
View File

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

2
plugins/Makefile
View File

@ -114,9 +114,11 @@ C_PLUGINS := \
plugins/spenderp \ plugins/spenderp \
plugins/cln-askrene plugins/cln-askrene
ifneq ($(NO_PYTHON), 1)
PY_PLUGINS := \ PY_PLUGINS := \
plugins/clnrest/clnrest \ plugins/clnrest/clnrest \
plugins/wss-proxy/wss-proxy plugins/wss-proxy/wss-proxy
endif
ifeq ($(HAVE_SQLITE3),1) ifeq ($(HAVE_SQLITE3),1)
C_PLUGINS += plugins/sql C_PLUGINS += plugins/sql