diff options
| author | 06kellyjac <dev@j-k.io> | 2022-09-07 17:10:10 +0100 |
|---|---|---|
| committer | Anders Kaseorg <andersk@mit.edu> | 2022-10-05 13:52:20 -0700 |
| commit | becacf259dc5689e38582489704ddf8063cec8b2 (patch) | |
| tree | f5fdbbb4fff0591375d3a194d3468ca0b4f03b24 /pkgs/servers/teleport/rdpclient.patch | |
| parent | 59d2991d4256cdca1c0cda45d876c80a0fe45c31 (diff) | |
| download | nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.tar nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.tar.gz nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.tar.bz2 nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.tar.lz nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.tar.xz nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.tar.zst nixpkgs-becacf259dc5689e38582489704ddf8063cec8b2.zip | |
teleport: 9.1.2 -> 10.3.1
Dropped the roletester since it doesn't exist anymore Co-authored-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/servers/teleport/rdpclient.patch')
| -rw-r--r-- | pkgs/servers/teleport/rdpclient.patch | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/servers/teleport/rdpclient.patch b/pkgs/servers/teleport/rdpclient.patch index 141d85ce42c..4f35cd184ab 100644 --- a/pkgs/servers/teleport/rdpclient.patch +++ b/pkgs/servers/teleport/rdpclient.patch @@ -1,17 +1,22 @@ diff --git a/lib/srv/desktop/rdp/rdpclient/client.go b/lib/srv/desktop/rdp/rdpclient/client.go -index d191c768f..71117a30d 100644 +index 4357d7aa1..7e21a0076 100644 --- a/lib/srv/desktop/rdp/rdpclient/client.go +++ b/lib/srv/desktop/rdp/rdpclient/client.go -@@ -56,10 +56,10 @@ package rdpclient - #cgo linux,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-unknown-linux-gnu/release - #cgo linux,arm LDFLAGS: -L${SRCDIR}/../../../../../target/arm-unknown-linux-gnueabihf/release - #cgo linux,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-unknown-linux-gnu/release +@@ -52,14 +52,9 @@ package rdpclient + + /* + // Flags to include the static Rust library. +-#cgo linux,386 LDFLAGS: -L${SRCDIR}/../../../../../target/i686-unknown-linux-gnu/release +-#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-unknown-linux-gnu/release +-#cgo linux,arm LDFLAGS: -L${SRCDIR}/../../../../../target/arm-unknown-linux-gnueabihf/release +-#cgo linux,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-unknown-linux-gnu/release -#cgo linux LDFLAGS: -l:librdp_client.a -lpthread -ldl -lm -+#cgo linux LDFLAGS: -l:librdp_client.a -lpthread -ldl -lm -lssl -lcrypto - #cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-apple-darwin/release - #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-apple-darwin/release +-#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-apple-darwin/release +-#cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-apple-darwin/release -#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client -lpthread -ldl -lm -+#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client -lpthread -ldl -lm -lssl -lcrypto ++#cgo LDFLAGS: -L${SRCDIR}/../../../../../lib -lpthread -ldl -lm -lssl -lcrypto ++#cgo linux LDFLAGS: -l:librdp_client.a ++#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client #include <librdprs.h> */ import "C" |