From 4d94729b6ebdeec469cd61ad46730b82707cc92d Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 2 Sep 2025 19:38:30 +0200
Subject: [PATCH] cider-2: 3.0.0 -> 3.1.1

---
 pkgs/by-name/ci/cider-2/package.nix | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 95b956ba0f2d..57970c6ceb04 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -8,21 +8,25 @@
 
   # Required dependencies for autoPatchelfHook
   alsa-lib,
+  asar,
   gtk3,
   libgbm,
+  libGL,
   nspr,
   nss,
+  widevine-cdm,
 }:
 stdenv.mkDerivation rec {
   pname = "cider-2";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb";
-    hash = "sha256-XKyzt8QkPNQlgFxR12KA5t+PCJki7UuFpn4SGmoGkpg=";
+    hash = "sha256-2gd/ThI59GFU/lMKFLtwHeRWSqp14jFd8YMrV8Cu/oQ=";
   };
 
   nativeBuildInputs = [
+    asar
     dpkg
     autoPatchelfHook
     makeWrapper
@@ -32,6 +36,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     gtk3
     libgbm
+    libGL
     nspr
     nss
   ];
@@ -54,10 +59,25 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postInstall = ''
+    ${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build
+
+    # Patch login popup webview creation
+    substituteInPlace ./cider-build/.vite/build/events-*.js \
+      --replace-fail 'else if(c.includes(r))return{action:"allow"}' 'else if(c.includes(r))return{action:"allow",overrideBrowserWindowOptions:{webPreferences:{devTools:!0,nodeIntegration:!1,contextIsolation:!0,webSecurity:!1,sandbox:!1,experimentalFeatures:!0}}}'
+
+    ${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar
+    rm -rf ./cider-build
+
+    # Install Widevine CDM for DRM support
+    ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/
+  '';
+
   postFixup = ''
     makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
       --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
-      --add-flags "--no-sandbox --disable-gpu-sandbox"
+      --add-flags "--no-sandbox --disable-gpu-sandbox" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
 
     mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
     substituteInPlace $out/share/applications/${pname}.desktop \