From 4509a43f25150c1c32a5155bbc5c3227016b4ba0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 3 Apr 2022 06:56:47 +0300 Subject: [PATCH] udisks2: use autoreconfHook, enable strictDeps, add passthru --- pkgs/os-specific/linux/udisks/2-default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 427e19ac9215..2f644ff36923 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, libtool, pkg-config, gettext, gnused +{ lib, stdenv, fetchFromGitHub, substituteAll, 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, autoconf, automake +, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43 , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g +, nixosTests }: stdenv.mkDerivation rec { @@ -41,8 +42,11 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; + # pkg-config had to be in both to find gtk-doc and gobject-introspection + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - autoconf automake pkg-config libtool gettext which gobject-introspection + autoreconfHook which gobject-introspection pkg-config gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; @@ -75,6 +79,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.vm = nixosTests.udisks2; + meta = with lib; { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; homepage = "https://www.freedesktop.org/wiki/Software/udisks/";