From 7f5aefa15cd66d1a024994ef5710ddaeac2eaff9 Mon Sep 17 00:00:00 2001 From: "kody.low" Date: Sat, 6 Apr 2024 21:01:24 -0700 Subject: [PATCH] fix: updates --- Cargo.toml | 5 +---- flake.nix | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 63865f1..f8adb42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,3 @@ [workspace] -members = [ - "multimint", - "fedimint-clientd", -] +members = ["multimint", "fedimint-clientd"] resolver = "2" diff --git a/flake.nix b/flake.nix index ea5fd59..745abe8 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ rustSrc = flakeboxLib.filterSubPaths { root = builtins.path { name = "fedimint-clientd"; - path = ./.; + path = ./fedimint-clientd; }; paths = [ "Cargo.toml" "Cargo.lock" ".cargo" "src" ]; }; @@ -75,17 +75,16 @@ in { legacyPackages = outputs; packages = { default = outputs.fedimint-clientd; }; - devShells = fmLib.devShells // { - default = fmLib.devShells.default.overrideAttrs (prev: { - nativeBuildInputs = [ - pkgs.mprocs - pkgs.go - pkgs.bun - fedimint.packages.${system}.devimint - fedimint.packages.${system}.gateway-pkgs - fedimint.packages.${system}.fedimint-pkgs - ] ++ prev.nativeBuildInputs; - }); + devShells = flakeboxLib.mkShells { + packages = [ ]; + nativeBuildInputs = [ + pkgs.mprocs + pkgs.go + pkgs.bun + fedimint.packages.${system}.devimint + fedimint.packages.${system}.gateway-pkgs + fedimint.packages.${system}.fedimint-pkgs + ]; }; }); }