diff options
Diffstat (limited to 'nixpkgs/pkgs/kde/plasma/plasma-vault')
5 files changed, 123 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/kde/plasma/plasma-vault/0001-encfs-path.patch b/nixpkgs/pkgs/kde/plasma/plasma-vault/0001-encfs-path.patch new file mode 100644 index 000000000000..a5e9d8c531e1 --- /dev/null +++ b/nixpkgs/pkgs/kde/plasma/plasma-vault/0001-encfs-path.patch @@ -0,0 +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 2d15fa2..3f49867 100644 +--- a/kded/engine/backends/encfs/encfsbackend.cpp ++++ b/kded/engine/backends/encfs/encfsbackend.cpp +@@ -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 + diff --git a/nixpkgs/pkgs/kde/plasma/plasma-vault/0002-cryfs-path.patch b/nixpkgs/pkgs/kde/plasma/plasma-vault/0002-cryfs-path.patch new file mode 100644 index 000000000000..4c7567b15076 --- /dev/null +++ b/nixpkgs/pkgs/kde/plasma/plasma-vault/0002-cryfs-path.patch @@ -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 + diff --git a/nixpkgs/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch b/nixpkgs/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch new file mode 100644 index 000000000000..0d4481c70541 --- /dev/null +++ b/nixpkgs/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch @@ -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 + diff --git a/nixpkgs/pkgs/kde/plasma/plasma-vault/0004-gocryptfs-path.patch b/nixpkgs/pkgs/kde/plasma/plasma-vault/0004-gocryptfs-path.patch new file mode 100644 index 000000000000..8790f877ff07 --- /dev/null +++ b/nixpkgs/pkgs/kde/plasma/plasma-vault/0004-gocryptfs-path.patch @@ -0,0 +1,13 @@ +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 diff --git a/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix b/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix new file mode 100644 index 000000000000..9ab545ab87b8 --- /dev/null +++ b/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix @@ -0,0 +1,29 @@ +{ + lib, + mkKdeDerivation, + pkg-config, + gocryptfs, + fuse, + cryfs, + encfs, +}: +mkKdeDerivation { + pname = "plasma-vault"; + + patches = [ + ./0001-encfs-path.patch + ./0002-cryfs-path.patch + ./0003-fusermount-path.patch + ./0004-gocryptfs-path.patch + ]; + + 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\"'' + ]; + + extraNativeBuildInputs = [pkg-config]; +} |