diff options
Diffstat (limited to 'pkgs/servers/teleport/generic.nix')
| -rw-r--r-- | pkgs/servers/teleport/generic.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 87719f03eb72..ed2ce5d8a7d1 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -54,7 +54,7 @@ let buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; nativeBuildInputs = [ pkg-config ]; # https://github.com/NixOS/nixpkgs/issues/161570 , @@ -144,23 +144,18 @@ buildGoModule rec { ++ lib.optional withRdpClient "desktop_access_rdp"; buildInputs = [ openssl libfido2 ] - ++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ]; nativeBuildInputs = [ makeWrapper pkg-config ]; patches = extPatches ++ [ ./0001-fix-add-nix-path-to-exec-env.patch ./rdpclient.patch - (if lib.versionAtLeast version "16" then ./tsh_16.patch else ./tsh.patch) + ./tsh.patch ]; # Reduce closure size for client machines outputs = [ "out" "client" ]; - prePatch = '' - # TODO: remove after https://github.com/NixOS/nixpkgs/pull/332852 merges - sed -i 's/go 1.22.6/go 1.22.5/' go.mod - ''; - preBuild = '' cp -r ${webassets} webassets '' + lib.optionalString withRdpClient '' |