Skip to content

Commit

Permalink
fix: flakebox install + commonArgs in devshells
Browse files Browse the repository at this point in the history
  • Loading branch information
Kodylow committed Apr 13, 2024
1 parent 2d68235 commit 59f7214
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .config/flakebox/id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4554d31c5e79420d5b097aad56a49a1c61bb89f32d6b93fb5ff4d0677bc9b587e3426e881d01f5551ff816cfcec2941d0529130f491f6098abb64e6c28592c94
9501c5c269226a4ea1bca7043d0b0cbe88e451514e3d43c089f74880a8a482980b414fb9d8f933589b2a1598f79fbc5646cca86da35e49ec694f6070a7ff53e5
8 changes: 6 additions & 2 deletions .github/workflows/flakebox-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@ jobs:
strategy:
matrix:
host:
- macos
- macos-x86_64
- macos-aarch64
- linux
include:
- host: linux
runs-on: ubuntu-latest
timeout: 60
- host: macos
- host: macos-x86_64
runs-on: macos-12
timeout: 60
- host: macos-aarch64
runs-on: macos-14
timeout: 60
timeout-minutes: ${{ matrix.timeout }}
flake:
name: Flake self-check
Expand Down
6 changes: 6 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ install-updater = true
[profile.dist]
inherits = "release"
lto = "thin"

[profile.ci]
inherits = "dev"
incremental = false
debug = "line-tables-only"
lto = "off"
4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
packages = { default = outputs.fedimint-clientd; };
devShells = flakeboxLib.mkShells {
packages = [ ];
nativeBuildInputs = [ pkgs.mprocs pkgs.go pkgs.bun ];
buildInputs = commonArgs.buildInputs;
nativeBuildInputs =
[ pkgs.mprocs pkgs.go pkgs.bun commonArgs.nativeBuildInputs ];
shellHook = ''
export RUSTFLAGS="--cfg tokio_unstable"
export RUSTDOCFLAGS="--cfg tokio_unstable"
Expand Down

0 comments on commit 59f7214

Please sign in to comment.