1 files changed, 9 insertions, 11 deletions

diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
index a786e86..f83e61b 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
@@ -1,6 +1,6 @@
 { varDir ? "/var/lib/roundcubemail"
 , roundcube_config ? "/etc/roundcube/config.php"
-, stdenv, fetchurl, jre, unzip, lib, callPackage }:
+, stdenv, fetchurl, which, nodePackages, lib, callPackage }:
 let
   defaultInstall = ''
     mkdir -p $out
@@ -52,22 +52,20 @@ let
         passthru = toPassthru newRoundcube pkg.plugins (pkg.skins ++ skins);
       });
     in newRoundcube;
-  shrinker = fetchurl {
-    url = "https://dl.google.com/closure-compiler/compiler-20200719.zip";
-    sha256 = "0j46y9ack2yq67naca6nfysbmyilwjlkl29dbswidf1lq09yhhj3";
-  };
   package = stdenv.mkDerivation rec {
-    version = "1.4.15";
+    version = "1.6.8";
     name = "roundcubemail-${version}";
     src= fetchurl {
       url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/${name}-complete.tar.gz";
-      sha256 = "sha256-0CRVGmPCjMOUPEELpWk93TifchXUbzhUvS55IOgaAh8=";
+      sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So=";
     };
-    patches = [ ./add_all.patch ]; # This patch includes js modification which requires to re-run the jsshrink below
-    buildInputs = [ unzip jre ];
+    patches = [
+      ./add_all.patch # This patch includes js modification which requires to re-run the jsshrink below
+      ./md5.patch
+    ];
+    buildInputs = [ which nodePackages.uglify-js ];
     buildPhase = ''
-      mkdir -p /tmp
-      unzip -p "${shrinker}" "*.jar" > "/tmp/compiler.jar"
+      sed -i -e "s/uglify-js/uglifyjs/g" ./bin/jsshrink.sh
       ./bin/jsshrink.sh
       sed -i \
         -e "s|RCUBE_INSTALL_PATH . 'temp.*|'${varDir}/cache';|" \