diff options
| author | K900 <me@0upti.me> | 2024-04-22 10:16:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 10:16:19 +0300 |
| commit | 5eade37305c7bab9a35c578c4798af454e9eacee (patch) | |
| tree | cb0f9bcbf483d35aa164bedd9c9da8d6f797e296 /pkgs/kde | |
| parent | db176ef1d6545cc4f3c0f930661e83ff5d0bcd76 (diff) | |
| parent | 9fd30b8be477f25819e1ec208c8e9f4debf5e304 (diff) | |
Merge pull request #305806 from K900/backport-solid-luks
kdePackages.solid: backport fix for mounting LUKS devices
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]; |