Skip to content

Commit 1ac6d75

Browse files
authored
chore: use normal nix shell, no rust toolchains needed (#131)
1 parent a7b978f commit 1ac6d75

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

flake.nix

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,56 @@
55
url = "github:fedimint/fedimint?ref=v0.4.3";
66
};
77
};
8-
outputs = { self, flake-utils, fedimint }:
9-
flake-utils.lib.eachDefaultSystem (system:
8+
outputs =
9+
{
10+
self,
11+
flake-utils,
12+
fedimint,
13+
}:
14+
flake-utils.lib.eachDefaultSystem (
15+
system:
1016
let
1117
nixpkgs = fedimint.inputs.nixpkgs;
1218
pkgs = import nixpkgs {
1319
inherit system;
1420
overlays = fedimint.overlays.fedimint;
1521
};
16-
fmLib = fedimint.lib.${system};
1722
in
1823
{
19-
devShells = fmLib.devShells // {
20-
default = fmLib.devShells.default.overrideAttrs (prev: {
24+
devShells = {
25+
default = pkgs.mkShell {
2126
nativeBuildInputs = [
2227
fedimint.packages.${system}.devimint
2328
fedimint.packages.${system}.gateway-pkgs
2429
fedimint.packages.${system}.fedimint-pkgs
30+
pkgs.bitcoind
31+
pkgs.electrs
32+
pkgs.jq
33+
pkgs.lnd
34+
pkgs.netcat
35+
pkgs.perl
36+
pkgs.esplora-electrs
37+
pkgs.procps
38+
pkgs.which
39+
2540
pkgs.pnpm
2641
pkgs.nodejs_20
27-
# The version of playwright in nixpkgs has to match the verison specified in package.json
42+
# The version of playwright in nixpkgs has to match the version specified in package.json
2843
pkgs.playwright-driver.browsers
29-
] ++ prev.nativeBuildInputs;
44+
];
3045

3146
shellHook = ''
3247
export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}
3348
export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true
3449
'';
35-
});
50+
};
3651
};
37-
});
52+
}
53+
);
3854
nixConfig = {
3955
extra-substituters = [ "https://fedimint.cachix.org" ];
40-
extra-trusted-public-keys = [ "fedimint.cachix.org-1:FpJJjy1iPVlvyv4OMiN5y9+/arFLPcnZhZVVCHCDYTs=" ];
56+
extra-trusted-public-keys = [
57+
"fedimint.cachix.org-1:FpJJjy1iPVlvyv4OMiN5y9+/arFLPcnZhZVVCHCDYTs="
58+
];
4159
};
4260
}

0 commit comments

Comments
 (0)