public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jx: fix build on darwin

Browse Source
This commit is contained in:
Mario Rodas 2020-03-21 06:14:00 -05:00
parent 5ba0036271
commit 8b8dff4cc9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/cluster/jx/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, lib }: { buildGoModule, fetchFromGitHub, stdenv, Security }:
buildGoModule rec { buildGoModule rec {
name = "jx"; name = "jx";
@ -16,6 +16,8 @@ buildGoModule rec {
./3321-fix-location-of-thrift.patch ./3321-fix-location-of-thrift.patch
]; ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac";
subPackages = [ "cmd/jx" ]; subPackages = [ "cmd/jx" ];
@ -26,7 +28,7 @@ buildGoModule rec {
-X github.com/jenkins-x/jx/pkg/version.Revision=${version} -X github.com/jenkins-x/jx/pkg/version.Revision=${version}
''; '';
meta = with lib; { meta = with stdenv.lib; {
description = "JX is a command line tool for installing and using Jenkins X."; description = "JX is a command line tool for installing and using Jenkins X.";
homepage = https://jenkins-x.io; homepage = https://jenkins-x.io;
longDescription = '' longDescription = ''

4
pkgs/top-level/all-packages.nix
View File

@ -25919,7 +25919,9 @@ in
sqsh = callPackage ../development/tools/sqsh { }; sqsh = callPackage ../development/tools/sqsh { };
jx = callPackage ../applications/networking/cluster/jx {}; jx = callPackage ../applications/networking/cluster/jx {
inherit (darwin.apple_sdk.frameworks) Security;
};
prow = callPackage ../applications/networking/cluster/prow { prow = callPackage ../applications/networking/cluster/prow {
# Version 2019-08-14 fails to build with go 1.13 due to dependencies: # Version 2019-08-14 fails to build with go 1.13 due to dependencies: