MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #173793 from 06kellyjac/trivy

Browse source 
trivy: mark x86_64-darwin broken
This commit is contained in:
Bobby Rong 2022-05-24 21:21:14 +08:00 committed by GitHub
commit da8c705785
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/admin/trivy/default.nix
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);
};
}

1
pkgs/top-level/all-packages.nix
View file

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