From b825db835b111886197a8ac3ac3bfdc70934efba Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Thu, 10 Apr 2025 23:59:41 +0300
Subject: [PATCH] teleport_17: 17.4.2 -> 17.4.3; teleport_16: 16.5.0 -> 16.5.1

Changelog: https://github.com/gravitational/teleport/releases/tag/v17.4.3
Diff: https://github.com/gravitational/teleport/compare/v17.4.2...v17.4.3

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.1
Diff: https://github.com/gravitational/teleport/compare/v16.5.0...v16.5.1
---
 pkgs/servers/teleport/16/default.nix              | 10 +++++-----
 pkgs/servers/teleport/17/default.nix              |  6 +++---
 .../teleport/disable-wasm-opt-for-ironrdp.patch   | 15 +++++++++++++++
 pkgs/servers/teleport/generic.nix                 | 14 +++++++-------
 4 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch

diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix
index e11c6eaf0d8d..15439eda05cd 100644
--- a/pkgs/servers/teleport/16/default.nix
+++ b/pkgs/servers/teleport/16/default.nix
@@ -2,10 +2,10 @@ args:
 import ../generic.nix (
   args
   // {
-    version = "16.5.0";
-    hash = "sha256-d634UB/YGDdAeBEJcRsRE5gqd31oQX3P4HJ+PoMQUmk=";
-    vendorHash = "sha256-0/ZYG8mYv3B0YJ89NJVG7M29/hU2zBtSXmoD32VEqpk=";
-    pnpmHash = "sha256-dqCfwMzSnEPQXz1bsroqSihkvw2Kcvyz+A4fpa52LVk=";
-    cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs=";
+    version = "16.5.1";
+    hash = "sha256-qDXJuKQ1IJ0+v4m5glEKNZVUBuLhG95MOzo0u3Ma2Qw=";
+    vendorHash = "sha256-pHAiJ080lyWtb7xbwSeD9g8JlyXZyqtZC2IpsUJ7YaY=";
+    pnpmHash = "sha256-XHiox+UYhGYgo+inrnOVy0qvPXm7xoCaGfAC4FQmaMM=";
+    cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
   }
 )
diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix
index 4907b21d80a1..703bd067c819 100644
--- a/pkgs/servers/teleport/17/default.nix
+++ b/pkgs/servers/teleport/17/default.nix
@@ -2,10 +2,10 @@
 import ../generic.nix (
   args
   // {
-    version = "17.4.2";
-    hash = "sha256-hiitFUN7bJR68sh/HrWsQMUm1lM2J3yjSoIT7mv/ldo=";
+    version = "17.4.3";
+    hash = "sha256-MdtvtM5Nd+e7eSmHf4OwdjuQ2rUjwsAusvO7kATnru0=";
     vendorHash = "sha256-03qkUH7UfAF0FwbG5enKf9Ke1teN89vmzk8yRfGvmPg=";
-    pnpmHash = "sha256-Hh4R+mkJJp9CR4NHw+VFzLPxb7e9T1BQkey0in2t934=";
+    pnpmHash = "sha256-zx1OKAeFo5zWvGHDdOOvtmYB+tX9sW5sIrXY2AXjPN0=";
     cargoHash = "sha256-0PT9y56V/WHo3M5TcpVWBuHcQMZ0w2L4rEuXuTvVNFU=";
   }
 )
diff --git a/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch b/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch
new file mode 100644
index 000000000000..05ecdb6f78cb
--- /dev/null
+++ b/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch
@@ -0,0 +1,15 @@
+# Based on https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1
+diff --git a/web/packages/shared/libs/ironrdp/Cargo.toml b/web/packages/shared/libs/ironrdp/Cargo.toml
+index 4252ba95372bdab9a1e2f74e164e303bedd5eee8..4c203290984223564f50ee775a137e86f3c2ddf0 100644
+--- a/web/packages/shared/libs/ironrdp/Cargo.toml
++++ b/web/packages/shared/libs/ironrdp/Cargo.toml
+@@ -7,6 +7,9 @@ publish.workspace = true
+ 
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ 
++[package.metadata.wasm-pack.profile.release]
++wasm-opt = false
++
+ [lib]
+ crate-type = ["cdylib"]
+ 
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix
index 0663d08b2424..cc99bbb45fd1 100644
--- a/pkgs/servers/teleport/generic.nix
+++ b/pkgs/servers/teleport/generic.nix
@@ -97,11 +97,7 @@ let
     ];
 
     patches = [
-      (fetchpatch {
-        name = "disable-wasm-opt-for-ironrdp.patch";
-        url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1";
-        hash = "sha256-Y5SVIUQsfi5qI28x5ccoRkBjpdpeYn0mQk8sLO644xo=";
-      })
+      ./disable-wasm-opt-for-ironrdp.patch
     ];
 
     configurePhase = ''
@@ -115,11 +111,15 @@ let
     buildPhase = ''
       PATH=$PATH:$PWD/node_modules/.bin
 
-      pushd web/packages/teleport
+      pushd web/packages
+      pushd shared
       # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
-      RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install
+      RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install
+      popd
+      pushd teleport
       vite build
       popd
+      popd
     '';
 
     installPhase = ''