Unverified Commit 5eade373 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #305806 from K900/backport-solid-luks

kdePackages.solid: backport fix for mounting LUKS devices
parents db176ef1 9fd30b8b
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
{
  mkKdeDerivation,
  fetchpatch,
  qttools,
  bison,
  flex,
@@ -8,8 +9,17 @@
mkKdeDerivation {
  pname = "solid";

  patches = [
    # Also search /run/wrappers for mount/umount
  patches = [./fix-search-path.patch];
    ./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];