From 622494d85d9e309e9e65ff62d5c48221f1e92f59 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:00:00 -0500 Subject: [PATCH] helmfile: fix build on darwin --- .../networking/cluster/helmfile/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ee7c4ab9cbd..2de07e9fdc7 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }: -let version = "0.102.0"; in - -buildGoModule { +buildGoModule rec { pname = "helmfile"; - inherit version; + version = "0.102.0"; src = fetchFromGitHub { owner = "roboll"; @@ -13,12 +11,12 @@ buildGoModule { sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy"; }; - goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq"; nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X main.Version=${version} @@ -26,14 +24,14 @@ buildGoModule { postInstall = '' wrapProgram $out/bin/helmfile \ - --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]} ''; - meta = { + meta = with stdenv.lib; { description = "Deploy Kubernetes Helm charts"; homepage = "https://github.com/roboll/helmfile"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ pneumaticat yurrriq ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6694cdee6fb..d31e25ba1d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25323,7 +25323,9 @@ in stdenv = gcc8Stdenv; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmfile = callPackage ../applications/networking/cluster/helmfile { + inherit (darwin.apple_sdk.frameworks) Security; + }; heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { };