From b1398870568b51ff90c7540f572fa58dcd580ce8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:03:00 -0500 Subject: [PATCH] frp: fix build on darwin --- pkgs/tools/networking/frp/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index f44e2208646..7323c914bfa 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "frp"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dcc312a635..cb3d41c8997 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10289,7 +10289,9 @@ in frame = callPackage ../development/libraries/frame { }; - frp = callPackage ../tools/networking/frp { }; + frp = callPackage ../tools/networking/frp { + inherit (darwin.apple_sdk.frameworks) Security; + }; fsatrace = callPackage ../development/tools/misc/fsatrace { };