Skip to content

Commit

Permalink
Fix isStatic arguments to commonDeps
Browse files Browse the repository at this point in the history
Some dependencies supposed to be skipped in the cross build, along with
not using the gold linker. But in #6538
this was accidentally not preserved.

Also since #6538 we saw some new
aarch64-linux static build failures. This is a first attempt to try to
fix those failures. If this is not sufficient, there are other things we
can try next.
  • Loading branch information
Ericson2314 committed Feb 21, 2023
1 parent 8418d22 commit 16111aa
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@
cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
});

commonDeps = { pkgs, isStatic ? false }: with pkgs; rec {
commonDeps =
{ pkgs
, isStatic ? pkgs.stdenv.hostPlatform.isStatic
}:
with pkgs; rec {
# Use "busybox-sandbox-shell" if present,
# if not (legacy) fallback and hope it's sufficient.
sh = pkgs.busybox-sandbox-shell or (busybox.override {
Expand Down Expand Up @@ -293,7 +297,13 @@
# Forward from the previous stage as we don’t want it to pick the lowdown override
nixUnstable = prev.nixUnstable;

nix = with final; with commonDeps { inherit pkgs; }; let
nix =
with final;
with commonDeps {
inherit pkgs;
inherit (currentStdenv.hostPlatform) isStatic;
};
let
canRunInstalled = currentStdenv.buildPlatform.canExecute currentStdenv.hostPlatform;
in currentStdenv.mkDerivation {
name = "nix-${version}";
Expand Down

0 comments on commit 16111aa

Please sign in to comment.