Skip to content

Commit 5eeacd0

Browse files
committed
Avoid non current system platform in the recursive nix
1 parent bf98104 commit 5eeacd0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

nix-tools/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
hydraJobs = forAllSystems
7979
(pkgs:
8080
# project's hydraJobs
81-
pkgs.nix-tools-unchecked.project.flake'.hydraJobs
81+
pkgs.nix-tools-eval-on-linux.project.flake'.hydraJobs
8282
# tarballs with static builds.
8383
// lib.optionalAttrs (pkgs.buildPlatform.system == "x86_64-linux")
8484
{ binary-tarball = mkTarball pkgs.pkgsCross.musl64; }

nix-tools/overlay.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ let
99

1010
nix-tools-unchecked = nix-tools-set {};
1111

12+
nix-tools-eval-on-linux = nix-tools-set {
13+
evalSystem = builtins.currentSystem or "x86_64-linux";
14+
};
15+
1216
nix-tools-set = args:
1317
let
1418
project = final.haskell-nix.cabalProject'
@@ -23,8 +27,6 @@ let
2327
# tests need to fetch hackage
2428
configureArgs = final.lib.mkDefault "--disable-tests";
2529

26-
evalSystem = builtins.currentSystem or "x86_64-linux";
27-
2830
# Tools to include in the development shell
2931
shell.tools.cabal = "latest";
3032
}
@@ -83,5 +85,5 @@ let
8385
toolset // warning;
8486
in
8587
{
86-
inherit nix-tools nix-tools-unchecked nix-tools-set;
88+
inherit nix-tools nix-tools-unchecked nix-tools-eval-on-linux nix-tools-set;
8789
}

0 commit comments

Comments
 (0)