diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix
index bd00bb23ea71..e0d2a9e8b4c3 100644
--- a/pkgs/by-name/cl/clickup/package.nix
+++ b/pkgs/by-name/cl/clickup/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  stdenvNoCC,
   appimageTools,
   fetchurl,
+  makeWrapper,
 }:
 let
   pname = "clickup";
@@ -13,24 +15,42 @@ let
     hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM=";
   };
 
+  appimage = appimageTools.wrapType2 {
+    inherit pname version src;
+    extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ];
+  };
+
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
-appimageTools.wrapType2 {
-  inherit pname version src;
+stdenvNoCC.mkDerivation {
+  inherit pname version;
 
-  extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ];
+  src = appimage;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/
+    cp -r bin $out/bin
+
+    mkdir -p $out/share/${pname}
+    cp -r ${appimageContents}/locales $out/share/${pname}
+    cp -r ${appimageContents}/resources $out/share/${pname}
+    cp -r --no-preserve=mode ${appimageContents}/usr/share/icons $out/share/
+    find $out/share/icons -name desktop.png -execdir mv {} clickup.png \;
 
-  extraInstallCommands = ''
     install -m 444 -D ${appimageContents}/desktop.desktop $out/share/applications/clickup.desktop
 
     substituteInPlace $out/share/applications/clickup.desktop \
       --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=clickup' \
       --replace-fail 'Icon=desktop' 'Icon=clickup'
 
-    for size in 16 32 64 128 256 512 1024; do
-      install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/desktop.png \
-        -t $out/share/icons/hicolor/''${size}x''${size}/apps/clickup.png
-    done
+    wrapProgram $out/bin/${pname} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update"
+
+    runHook postInstall
   '';
 
   meta = {