From 2865b8f2a320daad30021e39df3f3d70f1af4d76 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Tue, 28 Mar 2023 00:34:10 +0200 Subject: [PATCH] udisks: backport patch for crash on exit With modern versions of glib udisks reliably crashes when being shut down. The patch has been merged in 2021 [1] but there hasn't been a release including that patch yet [2]. Backport it to avoid crashes. [1] https://github.com/storaged-project/udisks/pull/926 [2] https://github.com/storaged-project/udisks/issues/1024#issuecomment-1296159423 --- pkgs/os-specific/linux/udisks/2-default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 5aff6e96970..9b56695e212 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, pkg-config, gnused, autoreconfHook +{ lib, stdenv, fetchFromGitHub, substituteAll, fetchpatch, pkg-config, gnused, autoreconfHook , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43 @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { xfsprogs ntfs3g parted util-linux ]; }) + # Fix crash on exit, remove on upgrade to 2.10. + (fetchpatch { + url = "https://github.com/storaged-project/udisks/commit/6464e3083c27b9e4d97848b9e69e862f265511d5.patch"; + hash = "sha256-XGprXjJLIL8l4P5MRTHV8GOQR1hpaaFiLgexGnO9Lvg="; + }) ]; strictDeps = true;