From a786cc022728cb7a109d2806942941d53db48bce Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 24 Feb 2024 08:58:57 -0600 Subject: nixos/systemd-boot: fix cross for lint check Since we are not in a `callPackage` context, dependencies in `nativeBuildInputs` don't get spliced to the buildPlatform, causing a cross-compiled nixos system to fail at this step when running mypy built for the hostPlatform. --- nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ea4553b8208f6..bc11969f38a8e 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -49,12 +49,10 @@ let ''; }; - checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { - nativeBuildInputs = [ pkgs.mypy ]; - } '' + checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { } '' mkdir -p $out/bin install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder - mypy \ + ${lib.getExe pkgs.buildPackages.mypy} \ --no-implicit-optional \ --disallow-untyped-calls \ --disallow-untyped-defs \ -- cgit 1.4.1