Skip to content

Commit 336f00f

Browse files
committed
Don't build workspace, add all package
1 parent e9340bc commit 336f00f

File tree

1 file changed

+27
-42
lines changed

1 file changed

+27
-42
lines changed

flake.nix

Lines changed: 27 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -66,55 +66,40 @@
6666
acceptLicenseAgreement = true;
6767
sdkSystem = system;
6868
})."0.8.4";
69-
in
70-
rec {
71-
# `nix build`
72-
defaultPackage = packages.workspace;
7369

74-
packages.workspace = naersk-lib.buildPackage rec {
75-
root = ./.;
76-
cargoBuildOptions = x: x ++ [
70+
buildRustPackage = name:
71+
let
72+
defaultArgs = [
7773
"--target" "wasm32-unknown-unknown"
7874
];
79-
cargoTestOptions = x: x ++ [
80-
"--target" "wasm32-unknown-unknown"
75+
packageArgs = [
76+
"--package" name
8177
];
82-
compressTarget = true;
83-
copyBins = false;
84-
copyTarget = true;
85-
};
78+
in
79+
naersk-lib.buildPackage {
80+
root = ./.;
81+
cargoBuildOptions = x: x ++ defaultArgs ++ packageArgs;
82+
cargoTestOptions = x: x ++ defaultArgs ++ packageArgs;
83+
compressTarget = true;
84+
copyBins = false;
85+
copyTarget = true;
86+
};
87+
in
88+
rec {
89+
# `nix build`
90+
defaultPackage = packages.all;
8691

87-
packages.icfs = naersk-lib.buildPackage rec {
88-
pname = "icfs";
89-
root = ./.;
90-
cargoBuildOptions = x: x ++ [
91-
"--package" pname
92-
"--target" "wasm32-unknown-unknown"
93-
];
94-
cargoTestOptions = x: x ++ [
95-
"--package" pname
96-
"--target" "wasm32-unknown-unknown"
92+
packages.all = pkgs.runCommand "all" {
93+
buildInputs = [
94+
packages.icfs
95+
packages.fat
9796
];
98-
compressTarget = true;
99-
copyBins = false;
100-
copyTarget = true;
101-
};
97+
} ''
98+
touch $out
99+
'';
102100

103-
packages.fat = naersk-lib.buildPackage rec {
104-
pname = "fat";
105-
root = ./.;
106-
cargoBuildOptions = x: x ++ [
107-
"--package" pname
108-
"--target" "wasm32-unknown-unknown"
109-
];
110-
cargoTestOptions = x: x ++ [
111-
"--package" pname
112-
"--target" "wasm32-unknown-unknown"
113-
];
114-
compressTarget = true;
115-
copyBins = false;
116-
copyTarget = true;
117-
};
101+
packages.icfs = buildRustPackage "icfs";
102+
packages.fat = buildRustPackage "fat";
118103

119104
# `nix develop`
120105
devShell = pkgs.mkShell {

0 commit comments

Comments
 (0)