diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f769850224b8..a3bd6bca4dc1 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,8 +2,6 @@ , stdenv , buildGoModule , fetchFromGitHub -, CoreFoundation -, Security }: buildGoModule rec { @@ -20,16 +18,13 @@ buildGoModule rec { excludedPackages = "misc"; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) - [ CoreFoundation Security ]; - ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; - # Tests requires network access + # Tests require network access doCheck = false; doInstallCheck = true; @@ -54,5 +49,8 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk ]; + # Need updated macOS SDK + # https://github.com/NixOS/nixpkgs/issues/101229 + broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eff99d8a45ee..7e92d3511938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5458,7 +5458,6 @@ with pkgs; trivy = callPackage ../tools/admin/trivy { buildGoModule = buildGo118Module; - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; trompeloeil = callPackage ../development/libraries/trompeloeil { };