kdePackages.solid: backport fix for mounting LUKS devices

Fixes #305748.
2024-04-21 21:18:18 +03:00
parent 014f831080
commit 9fd30b8be4
1 changed files with 12 additions and 2 deletions
@@ -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];