trivy: mark x86_64-darwin broken

This commit is contained in:
06kellyjac 2022-05-20 19:12:11 +01:00
parent 25e4e7af03
commit 7c0dd3ff5b
2 changed files with 4 additions and 7 deletions

View file

@ -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);
};
}

View file

@ -5464,7 +5464,6 @@ with pkgs;
trivy = callPackage ../tools/admin/trivy {
buildGoModule = buildGo118Module;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
trompeloeil = callPackage ../development/libraries/trompeloeil { };