diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-03-21 06:14:00 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-03-21 06:14:00 -0500 |
| commit | 8b8dff4cc92fa3f3999e2f1fc70f1404d4208516 (patch) | |
| tree | 646f55409de5f14ca6740cb6b90377d886e5cbcb /pkgs | |
| parent | 5ba00362714be0b22a21f08ba182fb7f6d8bc427 (diff) | |
| download | nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.tar nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.tar.gz nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.tar.bz2 nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.tar.lz nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.tar.xz nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.tar.zst nixlib-8b8dff4cc92fa3f3999e2f1fc70f1404d4208516.zip | |
jx: fix build on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/jx/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 88aa8777ee5e..f817a68ced19 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { name = "jx"; @@ -16,6 +16,8 @@ buildGoModule rec { ./3321-fix-location-of-thrift.patch ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; subPackages = [ "cmd/jx" ]; @@ -26,7 +28,7 @@ buildGoModule rec { -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."; homepage = https://jenkins-x.io; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f914e853854f..fbd343be6dd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25919,7 +25919,9 @@ in 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 { # Version 2019-08-14 fails to build with go 1.13 due to dependencies: |