From a674dd9f113cac63dad43ae60093bd0c7dbe2712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:13:03 +0200 Subject: [PATCH] cryptomator: stop overwriting maven --- pkgs/tools/security/cryptomator/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 597c34bf9ae2..38d3aa2a86ba 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -1,18 +1,11 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , autoPatchelfHook , fuse3 , maven, jdk, makeShellWrapper, glib, wrapGAppsHook3 , libayatana-appindicator }: - -let - mavenJdk = maven.override { - jdk = jdk; - }; -in -assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` -mavenJdk.buildMavenPackage rec { +maven.buildMavenPackage rec { pname = "cryptomator"; version = "1.13.0"; @@ -23,6 +16,7 @@ mavenJdk.buildMavenPackage rec { hash = "sha256-aKj8/yQzNWWV2m+sF2Or59OyPMiBqPeXEHn88w2VUkU="; }; + mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; mvnHash = "sha256-bZGTYkxRXgjGoxAdVkgiZZgVSghKz3Mq9pCBdivMNPQ=";