plasma5.plasma-vault: init at 5.11.1
This commit is contained in:
parent
84847258bb
commit
f8368f68ea
@ -133,6 +133,7 @@ let
|
||||
plasma-integration = callPackage ./plasma-integration.nix {};
|
||||
plasma-nm = callPackage ./plasma-nm {};
|
||||
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
|
||||
plasma-vault = callPackage ./plasma-vault {};
|
||||
plasma-workspace = callPackage ./plasma-workspace {};
|
||||
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
|
||||
polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
|
||||
|
17
pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
Normal file
17
pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
|
||||
index f6ef54f..160034a 100644
|
||||
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
|
||||
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
|
||||
@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const
|
||||
|
||||
QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
|
||||
{
|
||||
- return process("cryfs",
|
||||
+ return process(NIXPKGS_CRYFS,
|
||||
arguments,
|
||||
{ { "CRYFS_FRONTEND", "noninteractive" } });
|
||||
}
|
||||
|
||||
|
||||
} // namespace PlasmaVault
|
||||
-
|
38
pkgs/desktops/plasma-5/plasma-vault/default.nix
Normal file
38
pkgs/desktops/plasma-5/plasma-vault/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
|
||||
kactivities,
|
||||
plasma-framework,
|
||||
kwindowsystem,
|
||||
libksysguard,
|
||||
|
||||
encfs,
|
||||
cryfs,
|
||||
fuse
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "plasma-vault";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
patches = [
|
||||
./encfs-path.patch
|
||||
./cryfs-path.patch
|
||||
./fusermount-path.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kactivities plasma-framework kwindowsystem libksysguard
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
''-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"''
|
||||
];
|
||||
|
||||
}
|
24
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
Normal file
24
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
|
||||
index 47bb237..4ff064d 100644
|
||||
--- a/kded/engine/backends/encfs/encfsbackend.cpp
|
||||
+++ b/kded/engine/backends/encfs/encfsbackend.cpp
|
||||
@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const
|
||||
|
||||
QProcess *EncFsBackend::encfs(const QStringList &arguments) const
|
||||
{
|
||||
- return process("encfs", arguments, {});
|
||||
+ return process(NIXPKGS_ENCFS, arguments, {});
|
||||
}
|
||||
|
||||
|
||||
|
||||
QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
|
||||
{
|
||||
- return process("encfsctl", arguments, {});
|
||||
+ return process(NIXPKGS_ENCFSCTL, arguments, {});
|
||||
}
|
||||
|
||||
|
||||
|
||||
} // namespace PlasmaVault
|
||||
-
|
18
pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
Normal file
18
pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
|
||||
index 81ce494..d3c5c9f 100644
|
||||
--- a/kded/engine/fusebackend_p.cpp
|
||||
+++ b/kded/engine/fusebackend_p.cpp
|
||||
@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable,
|
||||
|
||||
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
|
||||
{
|
||||
- return process("fusermount", arguments, {});
|
||||
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
|
||||
}
|
||||
|
||||
|
||||
@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
|
||||
}
|
||||
|
||||
} // namespace PlasmaVault
|
||||
-
|
@ -18257,7 +18257,7 @@ with pkgs;
|
||||
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
|
||||
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
|
||||
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop
|
||||
plasma-integration plasma-nm plasma-pa plasma-workspace
|
||||
plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde
|
||||
systemsettings;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user