From 64b130dd88c925fd54102c0df83de74a26bcdbe3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:25:00 -0500 Subject: [PATCH] argo: fix build on darwin --- pkgs/applications/networking/cluster/argo/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index f02b64e92c8b..25fb33399c0d 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -32,6 +32,8 @@ buildGoModule rec { subPackages = [ "cmd/argo" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' mkdir -p ui/dist/app echo "Built without static files" > ui/dist/app/index.html @@ -39,7 +41,7 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Container native workflow engine for Kubernetes"; homepage = https://github.com/argoproj/argo; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0a2a7c4b42c..043adc4a1bcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18385,7 +18385,9 @@ in arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { }; + argo = callPackage ../applications/networking/cluster/argo { + inherit (darwin.apple_sdk.frameworks) Security; + }; argocd = callPackage ../applications/networking/cluster/argocd { };