From f2bca3b4a1ad7ce8aab47fdb95df4d44faa107f4 Mon Sep 17 00:00:00 2001 From: ozwaldorf Date: Tue, 2 Apr 2024 22:48:56 -0400 Subject: [PATCH] fix(nix): default app --- flake.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index a165af91c..0b8bc8347 100644 --- a/flake.nix +++ b/flake.nix @@ -156,10 +156,16 @@ # Expose the node and services as packages packages = rec { - default = lightning-node-full; + default = lightning-node; + + # Unified package with the node and all services + lightning-node = pkgs.symlinkJoin { + name = "lightning-node"; + paths = [ lightning-node-standalone lightning-services ]; + }; # Core node binary - lightning-node = craneLib.buildPackage (commonArgs // { + lightning-node-standalone = craneLib.buildPackage (commonArgs // { inherit cargoArtifacts; pname = "lightning-node"; doCheck = false; @@ -180,21 +186,17 @@ ]; }); - # Unified package with the node and all services - lightning-node-full = pkgs.symlinkJoin { - name = "lightning-node-full"; - paths = [ lightning-node lightning-services ]; - }; - # Expose for standalone ci step lightning-deps = cargoArtifacts; } // lib.optionalAttrs (!pkgs.stdenv.isDarwin) { + # Expose for ci lightning-llvm-coverage = llvmCraneLib.cargoLlvmCov (commonArgs // { inherit cargoArtifacts; }); }; # Allow using `nix run` on the project - apps.default = flake-utils.lib.mkApp { drv = self.packages.default; }; + apps.default = + flake-utils.lib.mkApp { drv = self.packages.${system}.default; }; # Allow using `nix develop on the project devShells.default = craneLib.devShell (commonVars // {