diff --git a/default.nix b/default.nix index a342c09..7022b0e 100644 --- a/default.nix +++ b/default.nix @@ -23,12 +23,13 @@ rec { }; unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix { }; } -// (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { +// pkgs.lib.optionalAttrs (pkgs ? buildGo124Module) { lint = pkgs.callPackage ./pkgs/lint.nix { inherit sops-install-secrets; }; - +} +// pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { cross-build = pkgs.callPackage ./pkgs/cross-build.nix { inherit sops-install-secrets; }; -}) +} diff --git a/pkgs/lint.nix b/pkgs/lint.nix index f14d1d8..e11a9c3 100644 --- a/pkgs/lint.nix +++ b/pkgs/lint.nix @@ -1,7 +1,12 @@ -{ sops-install-secrets, golangci-lint }: +{ + sops-install-secrets, + golangci-lint, +}: sops-install-secrets.overrideAttrs (old: { name = "golangci-lint"; - nativeBuildInputs = old.nativeBuildInputs ++ [ golangci-lint ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + golangci-lint + ]; buildPhase = '' HOME=$TMPDIR golangci-lint run --timeout 360s '';