git.iko.soy/typeable/nixpkgs
on master help sign in
plasma-vault: regenerate patches
commit18e622a1f5252de098186609493d518e3cfb6e52 authorThomas Tuegel <ttuegel@mailbox.org> dateTue 2 Nov 2021, 06:03 (5 years ago) parente169ff9
6 files changed+70−39
compare with master
unifiedsplit
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch → pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch+17−5 pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch+25 pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch+25 pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch−13 pkgs/desktops/plasma-5/plasma-vault/default.nix+3−3 pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch−18
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch → pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patchrenamed+17−5
@@ -1,19 +1,31 @@
1+From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Tue, 2 Nov 2021 05:57:50 -0500
4+Subject: [PATCH 1/3] encfs path
5+
6+---
7+ kded/engine/backends/encfs/encfsbackend.cpp | 4 ++--
8+ 1 file changed, 2 insertions(+), 2 deletions(-)
9+
110diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
2−index 628af7b..6edd38e 100644
11+index 2d15fa2..3f49867 100644
312--- a/kded/engine/backends/encfs/encfsbackend.cpp
413+++ b/kded/engine/backends/encfs/encfsbackend.cpp
5−@@ -100,12 +100,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
14+@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
615 auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
716 KConfigGroup backendConfig(config, "EncfsBackend");
8−
17+
918- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
1019+ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
1120 }
12−
21+
1322 QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
1423 {
1524- return process("encfsctl", arguments, {});
1625+ return process(NIXPKGS_ENCFSCTL, arguments, {});
1726 }
18−
27+
1928 } // namespace PlasmaVault
29+--
30+2.33.1
31+
pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patchnew file+25
@@ -0,0 +1,25 @@
1+From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Tue, 2 Nov 2021 05:59:34 -0500
4+Subject: [PATCH 2/3] cryfs path
5+
6+---
7+ kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +-
8+ 1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
11+index 64138b6..1a9fde2 100644
12+--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
13++++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
14+@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
15+ auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
16+ KConfigGroup backendConfig(config, "CryfsBackend");
17+
18+- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
19++ return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
20+ }
21+
22+ } // namespace PlasmaVault
23+--
24+2.33.1
25+
pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patchnew file+25
@@ -0,0 +1,25 @@
1+From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Tue, 2 Nov 2021 06:00:32 -0500
4+Subject: [PATCH 3/3] fusermount path
5+
6+---
7+ kded/engine/fusebackend_p.cpp | 2 +-
8+ 1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
11+index 91f3523..1c19d88 100644
12+--- a/kded/engine/fusebackend_p.cpp
13++++ b/kded/engine/fusebackend_p.cpp
14+@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
15+
16+ QProcess *FuseBackend::fusermount(const QStringList &arguments) const
17+ {
18+- return process("fusermount", arguments, {});
19++ return process(NIXPKGS_FUSERMOUNT, arguments, {});
20+ }
21+
22+ FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
23+--
24+2.33.1
25+
pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
2−index 58a6929..7212980 100644
3−--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
4−+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
5−@@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
6− auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
7− KConfigGroup backendConfig(config, "CryfsBackend");
8−
9−- return process("cryfs",
10−+ return process(NIXPKGS_CRYFS,
11− arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),
12− { { "CRYFS_FRONTEND", "noninteractive" } });
13− }
pkgs/desktops/plasma-5/plasma-vault/default.nix+3−3
@@ -18,9 +18,9 @@ mkDerivation {
1818 nativeBuildInputs = [ extra-cmake-modules ];
1919
2020 patches = [
21− ./encfs-path.patch
22− ./cryfs-path.patch
23− ./fusermount-path.patch
21+ ./0001-encfs-path.patch
22+ ./0002-cryfs-path.patch
23+ ./0003-fusermount-path.patch
2424 ];
2525
2626 buildInputs = [
pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patchdeleted−18
@@ -1,18 +0,0 @@
1−diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
2−index d07e313..ea7d81c 100644
3−--- a/kded/engine/fusebackend_p.cpp
4−+++ b/kded/engine/fusebackend_p.cpp
5−@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable,
6−
7− QProcess *FuseBackend::fusermount(const QStringList &arguments) const
8− {
9−- return process("fusermount", arguments, {});
10−+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
11− }
12−
13−
14−@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
15− }
16−
17− } // namespace PlasmaVault
18−-