commit d7bbeedaac9f07965cb47d0e5ec3301fd2a91aaa · pyrox.dev/nixpkgs

+12 -17

pkgs/tools/security/cryptomator/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       2
        
       , autoPatchelfHook

     

       3
       3
       -
       , fuse, jffi

     

       4
       4
       -
       , maven, jdk, jre, makeShellWrapper, glib, wrapGAppsHook

     

       3
       3
       +
       , fuse3

     

       4
       4
       +
       , maven, jdk, makeShellWrapper, glib, wrapGAppsHook

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         pname = "cryptomator";

     

       9
       9
       -
         version = "1.6.14";

     

       9
       9
       +
         version = "1.8.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "cryptomator";

     

       13
       13
        
           repo = "cryptomator";

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           sha256 = "sha256-ArOYL3xj2HiXXu1Bymd5mciMsmikCDvxr5M3LMqZgYA=";

     

       15
       15
       +
           sha256 = "sha256-4MjF2PDH0JB1biY4HO2wOC0i6EIGSlzkK6tDm8nzvIo=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)

     
···

       21
       21
        
           inherit src;

     

       22
       22
        
       

     

       23
       23
        
           nativeBuildInputs = [ jdk maven ];

     

       24
       24
       -
           buildInputs = [ jre ];

     

       24
       24
       +
           buildInputs = [ jdk ];

     

       25
       25
        
       

     

       26
       26
        
           buildPhase = ''

     

       27
       27
        
             while mvn -Plinux package -Dmaven.test.skip=true -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do

     
···

       35
       35
        
             find $out/.m2 -type f -iname '*.pom' -exec sed -i -e 's/\r\+$//' {} \;

     

       36
       36
        
           '';

     

       37
       37
        
       

     

       38
       38
       -
           outputHashAlgo = "sha256";

     

       39
       38
        
           outputHashMode = "recursive";

     

       40
       40
       -
           outputHash = "sha256-svpz1mHCHNQGWc+CBroAPvW4cXQdYuqFkK4JSmf6kXE=";

     

       39
       39
       +
           outputHash = "sha256-2nCaSL7OlS9f+PZPh0YiMvnjOaAqlQimkKWDSjSP+bQ=";

     

       41
       40
        
       

     

       42
       41
        
           doCheck = false;

     

       43
       42
        
         };

     
···

       60
       59
        
           cp target/libs/* $out/share/cryptomator/libs/

     

       61
       60
        
           cp target/mods/* target/cryptomator-*.jar $out/share/cryptomator/mods/

     

       62
       61
        
       

     

       63
       63
       -
           # The bundeled jffi.so dosn't work on nixos and causes a segmentation fault

     

       64
       64
       -
           # we thus replace it with a version build by nixos

     

       65
       65
       -
           rm $out/share/cryptomator/libs/jff*.jar

     

       66
       66
       -
           cp -f ${jffi}/share/java/jffi-complete.jar $out/share/cryptomator/libs/

     

       67
       67
       -
       

     

       68
       68
       -
           makeShellWrapper ${jre}/bin/java $out/bin/cryptomator \

     

       62
       62
       +
           makeShellWrapper ${jdk}/bin/java $out/bin/cryptomator \

     

       63
       63
       +
             --add-flags "--enable-preview" \

     

       69
       64
        
             --add-flags "--class-path '$out/share/cryptomator/libs/*'" \

     

       70
       65
        
             --add-flags "--module-path '$out/share/cryptomator/mods'" \

     

       71
       66
        
             --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \

     
···

       82
       77
        
             --add-flags "-Djavafx.embed.singleThread=true " \

     

       83
       78
        
             --add-flags "-Dawt.useSystemAAFontSettings=on" \

     

       84
       79
        
             --add-flags "--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" \

     

       85
       85
       -
             --prefix PATH : "$out/share/cryptomator/libs/:${lib.makeBinPath [ jre glib ]}" \

     

       86
       86
       -
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse ]}" \

     

       87
       87
       -
             --set JAVA_HOME "${jre.home}"

     

       80
       80
       +
             --prefix PATH : "$out/share/cryptomator/libs/:${lib.makeBinPath [ jdk glib ]}" \

     

       81
       81
       +
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 ]}" \

     

       82
       82
       +
             --set JAVA_HOME "${jdk.home}"

     

       88
       83
        
       

     

       89
       84
        
           # install desktop entry and icons

     

       90
       85
        
           cp -r ${src}/dist/linux/appimage/resources/AppDir/usr/* $out/

     
···

       105
       100
        
           wrapGAppsHook

     

       106
       101
        
           jdk

     

       107
       102
        
         ];

     

       108
       108
       -
         buildInputs = [ fuse jre glib jffi ];

     

       103
       103
       +
         buildInputs = [ fuse3 jdk glib ];

     

       109
       104
        
       

     

       110
       105
        
         meta = with lib; {

     

       111
       106
        
           description = "Free client-side encryption for your cloud files";

+3 -1

pkgs/top-level/all-packages.nix

···

       26443
       26443
        
       

     

       26444
       26444
        
         criu = callPackage ../os-specific/linux/criu { };

     

       26445
       26445
        
       

     

       26446
       26446
       -
         cryptomator = callPackage ../tools/security/cryptomator { };

     

       26446
       26446
       +
         cryptomator = callPackage ../tools/security/cryptomator {

     

       26447
       26447
       +
           jdk = jdk.override { enableJavaFX = true; };

     

       26448
       26448
       +
         };

     

       26447
       26449
        
       

     

       26448
       26450
        
         cryptsetup = callPackage ../os-specific/linux/cryptsetup { };

     

       26449
       26451