From c26cfcbf950d2e9c31a2707ea6fa32b397c6149a Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 3 Jan 2025 12:36:54 -0800
Subject: [PATCH 1/2] nixos-firewall-tool: fix cross-compilation

The shellcheck dependency should be placed in `nativeCheckInputs` to
ensure it is obtained from the correct package-set.
---
 pkgs/by-name/ni/nixos-firewall-tool/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
index a896109aa6a4..9c1aa059d32d 100644
--- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix
+++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
@@ -6,7 +6,7 @@
   shellcheck-minimal,
 }:
 
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
   name = "nixos-firewall-tool";
 
   src = builtins.filterSource (name: _: !(lib.hasSuffix ".nix" name)) ./.;
@@ -14,6 +14,7 @@ stdenvNoCC.mkDerivation {
   strictDeps = true;
   buildInputs = [ bash ];
   nativeBuildInputs = [ installShellFiles ];
+  nativeCheckInputs = lib.optionals finalAttrs.doCheck [ shellcheck-minimal ];
 
   postPatch = ''
     patchShebangs --host nixos-firewall-tool
@@ -30,7 +31,7 @@ stdenvNoCC.mkDerivation {
     lib.meta.availableOn stdenvNoCC.buildPlatform shellcheck-minimal.compiler
     && (builtins.tryEval shellcheck-minimal.compiler.outPath).success;
   checkPhase = ''
-    ${lib.getExe shellcheck-minimal} nixos-firewall-tool
+    shellcheck nixos-firewall-tool
   '';
 
   meta = with lib; {
@@ -44,4 +45,4 @@ stdenvNoCC.mkDerivation {
     platforms = platforms.linux;
     mainProgram = "nixos-firewall-tool";
   };
-}
+})

From d2fa4b5d460aa2c28057519439e9d2480adc75c7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 4 Jan 2025 13:52:37 +0100
Subject: [PATCH 2/2] fixup! nixos-firewall-tool: fix cross-compilation

---
 pkgs/by-name/ni/nixos-firewall-tool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
index 9c1aa059d32d..b928487c5277 100644
--- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix
+++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
@@ -6,7 +6,7 @@
   shellcheck-minimal,
 }:
 
-stdenvNoCC.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation {
   name = "nixos-firewall-tool";
 
   src = builtins.filterSource (name: _: !(lib.hasSuffix ".nix" name)) ./.;
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   strictDeps = true;
   buildInputs = [ bash ];
   nativeBuildInputs = [ installShellFiles ];
-  nativeCheckInputs = lib.optionals finalAttrs.doCheck [ shellcheck-minimal ];
+  nativeCheckInputs = [ shellcheck-minimal ];
 
   postPatch = ''
     patchShebangs --host nixos-firewall-tool
@@ -45,4 +45,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = platforms.linux;
     mainProgram = "nixos-firewall-tool";
   };
-})
+}