From 37087c1550d7afdfdf37b212ad59dc4481b6fef7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:01:00 -0500 Subject: [PATCH] prow: fix build on darwin --- pkgs/applications/networking/cluster/prow/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 1c802802c096..e3eb24b23746 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "prow-unstable"; @@ -20,6 +20,8 @@ buildGoModule rec { modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "./prow/cmd/admission" "./prow/cmd/artifact-uploader" @@ -54,7 +56,7 @@ buildGoModule rec { "./prow/cmd/tot" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Prow is a Kubernetes based CI/CD system"; longDescription = '' Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d31e25ba1d28..3b1c426d6598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25901,6 +25901,7 @@ in # Version 2019-08-14 fails to build with go 1.13 due to dependencies: # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; inherit (callPackage ../applications/networking/cluster/terraform {