From a5a687734a963dc48ffbe2ed036809ae9e7bcb91 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:53:00 -0500 Subject: [PATCH] drone-cli: fix build on darwin --- .../continuous-integration/drone-cli/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index a3df81d26053..c6e4878d52c4 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: -let version = "1.2.1"; -in buildGoModule rec { - inherit version; +buildGoModule rec { pname = "drone-cli"; - revision = "v${version}"; - goPackagePath = "github.com/drone/drone-cli"; + version = "1.2.1"; modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; @@ -16,10 +13,12 @@ in buildGoModule rec { src = fetchFromGitHub { owner = "drone"; repo = "drone-cli"; - rev = revision; + rev = "v${version}"; sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e88aab49b04a..33e45bed6164 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2985,7 +2985,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; dropbear = callPackage ../tools/networking/dropbear { };