diff options
| author | K900 <me@0upti.me> | 2024-04-21 21:18:18 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-04-21 21:18:18 +0300 |
| commit | 9fd30b8be477f25819e1ec208c8e9f4debf5e304 (patch) | |
| tree | 3e8f96a8c79642fe5df0c2e5e458a4d345b76d0c /pkgs/kde | |
| parent | 014f83108089730a473b86401b20d9b88d662e23 (diff) | |
kdePackages.solid: backport fix for mounting LUKS devices
Fixes #305748.
Diffstat (limited to 'pkgs/kde')
| -rw-r--r-- | pkgs/kde/frameworks/solid/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index 08419f4b97849..d59d15f16ead3 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, qttools, bison, flex, @@ -8,8 +9,17 @@ mkKdeDerivation { pname = "solid"; - # Also search /run/wrappers for mount/umount - patches = [./fix-search-path.patch]; + patches = [ + # Also search /run/wrappers for mount/umount + ./fix-search-path.patch + + # Backport fix for mounting removable LUKS devices + # FIXME: remove in 6.2 + (fetchpatch { + url = "https://invent.kde.org/frameworks/solid/-/commit/a3b18591ba144fae0cd0cfc087a45c64000d4e51.patch"; + hash = "sha256-e7+amjOShUSzPb0pAxnAuuh/fbK/YLESqR0co1bs+wg="; + }) + ]; extraNativeBuildInputs = [qttools bison flex]; extraBuildInputs = [libimobiledevice]; |