b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #195485 from 06kellyjac/teleport-fix

Browse source 
teleport: fix for darwin
This commit is contained in:
Jörg Thalheim 2022-10-11 14:39:33 +02:00 committed by GitHub
parent d5af38887f 097ec65336
commit e325d85f0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/servers/teleport/default.nix
View file

@ -5,6 +5,7 @@
, makeWrapper , makeWrapper
, symlinkJoin , symlinkJoin
, CoreFoundation , CoreFoundation
, AppKit
, libfido2 , libfido2
, openssl , openssl
, pkg-config , pkg-config
@ -68,7 +69,7 @@ buildGoModule rec {
++ lib.optional withRdpClient "desktop_access_rdp"; ++ lib.optional withRdpClient "desktop_access_rdp";
buildInputs = [ openssl libfido2 ] buildInputs = [ openssl libfido2 ]
++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security ]; ++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ];
nativeBuildInputs = [ makeWrapper pkg-config ]; nativeBuildInputs = [ makeWrapper pkg-config ];
patches = [ patches = [

2
pkgs/top-level/all-packages.nix
View file

@ -11718,7 +11718,7 @@ with pkgs;
}; };
teleport = callPackage ../servers/teleport { teleport = callPackage ../servers/teleport {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
}; };
telepresence = callPackage ../tools/networking/telepresence { telepresence = callPackage ../tools/networking/telepresence {