1 files changed, 13 insertions, 21 deletions
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index e750a8f29ca6..6a6a851d765a 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -24,16 +24,14 @@
   nss,
   nspr,
   vips,
-  wrapGAppsHook3,
   udev,
   libGL,
   unzip,
-  makeWrapper,
 }:
 let
   selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
   pname = "waveterm";
-  version = "0.11.1";
+  version = "0.11.2";
 
   passthru.updateScript = ./update.sh;
 
@@ -64,16 +62,14 @@ let
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb";
         hash = selectSystem {
-          x86_64-linux = "sha256-At6mNL1M0/zcDb+IbQi0+eUAGMcCmgLYk6XAlU1+8cw=";
-          aarch64-linux = "sha256-N6tTCfB9MqDX+OnFmuYbWs0XKEmQH7PSGuCadjM8Rmg=";
+          x86_64-linux = "sha256-KsE7/L5fRnpAdvcHkZGk3s0qKRDfyO00UtNH0uaCs78=";
+          aarch64-linux = "sha256-l2Uz2y4GQhU0UNtPMumWPPdpMqmZH1i79gg53V3wfA8=";
         };
       };
 
     nativeBuildInputs = [
       dpkg
       autoPatchelfHook
-      wrapGAppsHook3
-      makeWrapper
     ];
 
     buildInputs = [
@@ -99,29 +95,27 @@ let
       vips
     ];
 
-    runtimeDependencies = map lib.getLib [
-      udev
-    ];
-
     installPhase = ''
       runHook preInstall
 
-      cp -r opt $out
+      mkdir -p $out/bin $out/app
+      cp -r opt/Wave $out/app/waveterm
       cp -r usr/share $out/share
       substituteInPlace $out/share/applications/waveterm.desktop \
         --replace-fail "/opt/Wave/" ""
+      ln -s $out/app/waveterm/waveterm $out/bin/waveterm
 
       runHook postInstall
     '';
 
     preFixup = ''
-      mkdir $out/bin
-      makeWrapper $out/Wave/waveterm $out/bin/waveterm \
-        --prefix LD_LIBRARY_PATH : "${
+      patchelf --add-needed libGL.so.1 \
+        --add-rpath ${
           lib.makeLibraryPath [
             libGL
+            udev
           ]
-        }"
+        } $out/app/waveterm/waveterm
     '';
 
     meta = metaCommon // {
@@ -142,14 +136,12 @@ let
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
         hash = selectSystem {
-          x86_64-darwin = "sha256-QkSsoMW0Ry4aLF9XtRpC7pIY84WAhtCbZGBZ1RCeMN8=";
-          aarch64-darwin = "sha256-mVVThER1h0EB0ONNTxaBrSvAU9PP35MSPc0eW4mfJXo=";
+          x86_64-darwin = "sha256-SWISlOG/NIrp7leCCSI4yH8k30Ky280yMY+yirLNGfA=";
+          aarch64-darwin = "sha256-9zNYpUP2KizYWUr3+o6lBgGP9S9VwIrfcY9E3L+o3KU=";
         };
       };
 
-    nativeBuildInputs = [
-      unzip
-    ];
+    nativeBuildInputs = [ unzip ];
 
     installPhase = ''
       runHook preInstall