Unverified Commit c26cfcbf authored by Jared Baur's avatar Jared Baur
Browse files

nixos-firewall-tool: fix cross-compilation 

The shellcheck dependency should be placed in `nativeCheckInputs` to
ensure it is obtained from the correct package-set.
parent 92befe37

pkgs/by-name/ni/nixos-firewall-tool/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -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";

  };

}
 
})