From 582a42ece7e2a86d5b076addd5f18a6379fd326a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Apr 2022 16:32:26 +0100 Subject: [PATCH] lvm2: fix static compilation This should avoid a infinity recursion issue during static compilation, by making util-linux not a dependency of the `fix-blkdeactivate.patch`. --- pkgs/os-specific/linux/lvm2/common.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 641945a5685a..53cab49f1a63 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -4,18 +4,19 @@ , fetchpatch , fetchurl , pkg-config -, util-linux , coreutils , libuuid , libaio , substituteAll , enableCmdlib ? false , enableDmeventd ? false -, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null +, udevSupport ? !stdenv.hostPlatform.isStatic, udev , onlyLib ? stdenv.hostPlatform.isStatic -, enableVDO ? false, vdo ? null -, enableMdadm ? false, mdadm ? null -, enableMultipath ? false, multipath-tools ? null + # Otherwise we have a infinity recursion during static compilation +, enableUtilLinux ? !stdenv.hostPlatform.isStatic, util-linux +, enableVDO ? false, vdo +, enableMdadm ? false, mdadm +, enableMultipath ? false, multipath-tools , nixosTests }: @@ -102,7 +103,7 @@ stdenv.mkDerivation rec { in { src = ./fix-blkdeactivate.patch; inherit coreutils; - util_linux = util-linux; + util_linux = optionalTool enableUtilLinux util-linux; mdadm = optionalTool enableMdadm mdadm; multipath_tools = optionalTool enableMultipath multipath-tools; vdo = optionalTool enableVDO vdo;