gnu: plasma-vault: Remove and refresh inputs.

* gnu/packages/kde-plasma.scm (plasma-vault)[inputs]:
Remove fuse-2, cryfs and encfs; add fuse.
[arguments]<#:phases>{patch}: Adapt substitutions.

Change-Id: I5500897b6caca6383e2543512cce280a9dd7e31f

2 files changed, 6 insertions, 19 deletions

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 538afa9b33a..b6fb9b45597 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1671,7 +1671,7 @@ non-encrypted files.")
     (native-inputs
      (list googletest pkg-config python-wrapper))
     (inputs
-     (list boost curl fuse-2 range-v3 spdlog))
+     (list boost curl fuse range-v3 spdlog))
     (home-page "https://www.cryfs.org/")
     (synopsis "Encrypted FUSE filesystem for the cloud")
     (description "CryFS encrypts your files, so you can safely store them anywhere.
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 45c9847682e..dfa4b0a5338 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -2687,10 +2687,8 @@ KDED module to handle authorization of Thunderbolt devices.")
                   libplasma
                   qtdeclarative
 
-                  cryfs
-                  fuse-2
-                  gocryptfs
-                  encfs))
+                  fuse
+                  gocryptfs))
     (arguments
      (list
       #:qtbase qtbase
@@ -2699,25 +2697,14 @@ KDED module to handle authorization of Thunderbolt devices.")
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch
             (lambda* (#:key inputs #:allow-other-keys)
-              (let ((fusermount (search-input-file inputs "/bin/fusermount"))
-                    (gocryptfs (search-input-file inputs "/bin/gocryptfs"))
-                    (cryfs (search-input-file inputs "/bin/cryfs"))
-                    (encfs (search-input-file inputs "/bin/encfs"))
-                    (encfsctl (search-input-file inputs "/bin/encfsctl")))
+              (let ((fusermount (search-input-file inputs "/bin/fusermount3"))
+                    (gocryptfs (search-input-file inputs "/bin/gocryptfs")))
                 (substitute* "kded/engine/fusebackend_p.cpp"
                   (("\"fusermount\"")
                    (string-append "\"" fusermount "\"")))
                 (substitute* "kded/engine/backends/gocryptfs/gocryptfsbackend.cpp"
                   (("\"gocryptfs\"")
-                   (string-append "\"" gocryptfs "\"")))
-                (substitute* "kded/engine/backends/cryfs/cryfsbackend.cpp"
-                  (("\"cryfs\"")
-                   (string-append "\"" cryfs "\"")))
-                (substitute* "kded/engine/backends/encfs/encfsbackend.cpp"
-                  (("\"encfs\"")
-                   (string-append "\"" encfs "\""))
-                  (("\"encfsctl\"")
-                   (string-append "\"" encfsctl "\"")))))))))
+                   (string-append "\"" gocryptfs "\"")))))))))
     (home-page "https://invent.kde.org/plasma/plasma-vault")
     (synopsis "Plasma applet and services for creating encrypted vaults")
     (description "Provides Plasma applet and services for creating encrypted