Skip to content

Commit 63ad896

Browse files
author
Matthijs van Otterdijk
committed
export overlays
1 parent 22b9d97 commit 63ad896

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
nixpkgsFor = forAllSystems makeOverlay;
2828
in
2929
{
30+
overlays = nixpkgsFor;
3031
packages = forAllSystems (system:
3132
let pkgs = nixpkgsFor.${system};
3233
in

nix/overlay.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Takes flake inputs as an attribute set, and a path to the workspace root.
2-
# Output is a function that takes a system and produces an overlay for
3-
# building the projects in this workspace.
2+
# Output is a an overlay for # building the projects in this
3+
# workspace.
44
#
55
# Specifically, we ensure there's a configured craneLib with
66
# arch-specific rust args for simd instructions, and we provide a
@@ -9,8 +9,8 @@
99
#
1010
# It also makes sure we can build poetry projects, for better or worse.
1111
let rustFlagsFor = {
12-
x86_64-linux = "-C target-feature=+sse3,+avx,+avx2";
13-
aarch64-linux = "-C target-feature=+v7,+neon";
12+
x86 = "-C target-feature=+sse3,+avx,+avx2";
13+
arm = "-C target-feature=+v7,+neon";
1414
};
1515
in
1616
path:
@@ -30,7 +30,7 @@ import nixpkgs {
3030
buildInputs = [
3131
final.openssl
3232
];
33-
RUSTFLAGS = rustFlagsFor.${system};
33+
RUSTFLAGS = if final.stdenv.hostPlatform.isAarch64 then rustFlagsFor.arm else rustFlagsFor.x86;
3434
src = craneLib.cleanCargoSource (craneLib.path path);
3535
strictDeps = true;
3636
doCheck = false;

vectorlink-infra/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub mod aws;

0 commit comments

Comments
 (0)