b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

plasma-vault: regenerate patches

Browse source
This commit is contained in:
Thomas Tuegel 2021-11-02 06:03:09 -05:00
parent e169ff9dfa
commit 18e622a1f5
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
6 changed files with 70 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch → pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch
View file

@ -1,19 +1,31 @@
From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 05:57:50 -0500
Subject: [PATCH 1/3] encfs path
---
kded/engine/backends/encfs/encfsbackend.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
index 628af7b..6edd38e 100644
index 2d15fa2..3f49867 100644
--- a/kded/engine/backends/encfs/encfsbackend.cpp
+++ b/kded/engine/backends/encfs/encfsbackend.cpp
@@ -100,12 +100,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "EncfsBackend");
- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
}
QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
{
- return process("encfsctl", arguments, {});
+ return process(NIXPKGS_ENCFSCTL, arguments, {});
}
} // namespace PlasmaVault
--
2.33.1

25
pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch Normal file
View file

@ -0,0 +1,25 @@
From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 05:59:34 -0500
Subject: [PATCH 2/3] cryfs path
---
kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
index 64138b6..1a9fde2 100644
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "CryfsBackend");
- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
+ return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
}
} // namespace PlasmaVault
--
2.33.1

25
pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch Normal file
View file

@ -0,0 +1,25 @@
From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 06:00:32 -0500
Subject: [PATCH 3/3] fusermount path
---
kded/engine/fusebackend_p.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 91f3523..1c19d88 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process("fusermount", arguments, {});
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
}
FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
--
2.33.1

13
pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
View file

@ -1,13 +0,0 @@
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
index 58a6929..7212980 100644
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
@@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "CryfsBackend");
- return process("cryfs",
+ return process(NIXPKGS_CRYFS,
arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),
{ { "CRYFS_FRONTEND", "noninteractive" } });
}

6
pkgs/desktops/plasma-5/plasma-vault/default.nix
View file

@ -18,9 +18,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
patches = [
./encfs-path.patch
./cryfs-path.patch
./fusermount-path.patch
./0001-encfs-path.patch
./0002-cryfs-path.patch
./0003-fusermount-path.patch
];
buildInputs = [

18
pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
View file

@ -1,18 +0,0 @@
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index d07e313..ea7d81c 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable,
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process("fusermount", arguments, {});
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
}
@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
}
} // namespace PlasmaVault
-