dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #271871 from jensbin/cryptomator_with_dbus_and_appindicator

Browse Source 
cryptomator: Add secret service and appindicator
This commit is contained in:
Pascal Bach 2023-12-08 11:59:37 +01:00 committed by GitHub
commit 41d3b54ff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/security/cryptomator/default.nix
View File

@ -2,6 +2,7 @@
, autoPatchelfHook
, fuse3
, maven, jdk, makeShellWrapper, glib, wrapGAppsHook
, libayatana-appindicator
}:
@ -22,15 +23,14 @@ mavenJdk.buildMavenPackage rec {
hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI=";
};
mvnParameters = "-Dmaven.test.skip=true";
mvnHash = "sha256-jIHMUj7ZQFu4XAvWUywj4f0PbmLHGtU5VRG0ZuKm3mA=";
mvnParameters = "-Dmaven.test.skip=true -Plinux";
mvnHash = "sha256-cmwU9k7TRRJ07bT1EmY3pIBkvvqmFyE7WJeVL7VFDyc=";
preBuild = ''
VERSION=${version}
SEMVER_STR=${version}
'';
# This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh
installPhase = ''
mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/
@ -38,8 +38,9 @@ mavenJdk.buildMavenPackage rec {
cp target/libs/* $out/share/cryptomator/libs/
cp target/mods/* target/cryptomator-*.jar $out/share/cryptomator/mods/
makeShellWrapper ${jdk}/bin/java $out/bin/cryptomator \
makeShellWrapper ${jdk}/bin/java $out/bin/${pname} \
--add-flags "--enable-preview" \
--add-flags "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.purejava.appindicator" \
--add-flags "--class-path '$out/share/cryptomator/libs/*'" \
--add-flags "--module-path '$out/share/cryptomator/mods'" \
--add-flags "-Dfile.encoding='utf-8'" \
@ -49,17 +50,17 @@ mavenJdk.buildMavenPackage rec {
--add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'" \
--add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'" \
--add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'" \
--add-flags "-Dcryptomator.showTrayIcon=false" \
--add-flags "-Dcryptomator.buildNumber='nix'" \
--add-flags "-Dcryptomator.showTrayIcon=true" \
--add-flags "-Dcryptomator.buildNumber='nix-${src.rev}'" \
--add-flags "-Dcryptomator.appVersion='${version}'" \
--add-flags "-Djdk.gtk.version=3" \
--add-flags "-Djava.net.useSystemProxies=true" \
--add-flags "-Xss20m" \
--add-flags "-Xmx512m" \
--add-flags "-Djavafx.embed.singleThread=true " \
--add-flags "-Dawt.useSystemAAFontSettings=on" \
--add-flags "-Dcryptomator.disableUpdateCheck=true" \
--add-flags "-Dcryptomator.integrationsLinux.trayIconsDir='$out/share/icons/hicolor/symbolic/apps'" \
--add-flags "--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" \
--prefix PATH : "$out/share/cryptomator/libs/:${lib.makeBinPath [ jdk glib ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 libayatana-appindicator ]}" \
--set JAVA_HOME "${jdk.home}"
# install desktop entry and icons
@ -80,7 +81,7 @@ mavenJdk.buildMavenPackage rec {
wrapGAppsHook
jdk
];
buildInputs = [ fuse3 jdk glib ];
buildInputs = [ fuse3 jdk glib libayatana-appindicator ];
meta = with lib; {
description = "Free client-side encryption for your cloud files";