Unverified Commit edd8b081 authored by Mathieu Fenniak's avatar Mathieu Fenniak Committed by GitHub
Browse files

plasma-vault: add gocryptfs support (#205519)

parent 5128a000

pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp

index 2d6df94..3e8ec9a 100644

--- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp

+++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp

@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const

     auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);

     KConfigGroup backendConfig(config, "GocryptfsBackend");

 

-    return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});

+    return process(NIXPKGS_GOCRYPTFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});

 }

 

 QString GocryptfsBackend::getConfigFilePath(const Device &device) const

pkgs/desktops/plasma-5/plasma-vault/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, encfs

, cryfs

, fuse

, gocryptfs

}:



mkDerivation {
@@ -19,6 +20,7 @@ mkDerivation { 
    ./0001-encfs-path.patch

    ./0002-cryfs-path.patch

    ./0003-fusermount-path.patch

    ./0004-gocryptfs-path.patch

  ];



  buildInputs = [
@@ -32,10 +34,9 @@ mkDerivation { 
  CXXFLAGS = [

    ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''

    ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''



    ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''



    ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''

    ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''

  ];



}