Skip to content

Commit 7ff18fd

Browse files
committed
Add support for static build of nix-tools
1 parent a293a10 commit 7ff18fd

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

nix-tools/flake.nix

+7-3
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@
5252
echo "file binary-dist $out/${tarball-filename}" >> $out/nix-support/hydra-build-products
5353
'';
5454

55-
in
56-
{
57-
5855
static-nix-tools-outputs = import ./static/outputs.nix inputs;
56+
57+
in {
58+
59+
inherit static-nix-tools-outputs;
5960

6061
# this is not per-system!
6162
overlays.default = import ./overlay.nix;
@@ -92,6 +93,9 @@
9293
# aarch64-multiplatform-musl cross compile is currently broken
9394
# // lib.optionalAttrs (pkgs.buildPlatform.system == "aarch64-linux")
9495
# { binary-tarball = mkTarball pkgs.pkgsCross.aarch64-multiplatform-musl; }
96+
// {
97+
static = static-nix-tools-outputs.hydraJobs.${pkgs.system};
98+
}
9599
);
96100
};
97101

nix-tools/static/outputs.nix

+4-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ let
6666

6767

6868
outputs = {
69-
zipped = forAllSystems (import ./zipped.nix inputs);
69+
hydraJobs = forAllSystems (pkgs: {
70+
zipped = import ./zipped.nix inputs pkgs;
71+
flake = (import ./project.nix inputs pkgs).flake'.hydraJobs;
72+
});
7073
};
7174

7275
in

0 commit comments

Comments
 (0)