trying to fix darwin build

main
06kellyjac 2 years ago
parent 19c42b883f
commit 73714678f1
  1. 7
      pkgs/tools/admin/trivy/default.nix
  2. 1
      pkgs/top-level/all-packages.nix

@ -1,6 +1,9 @@
{ lib { lib
, stdenv
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, CoreFoundation
, Security
}: }:
buildGoModule rec { buildGoModule rec {
@ -13,11 +16,13 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8="; sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8=";
}; };
vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0="; vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0=";
excludedPackages = "misc"; excludedPackages = "misc";
buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64)
[ CoreFoundation Security ];
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"

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

Loading…
Cancel
Save