From c9de099fa1b00bca89183a9e3347c2629f1dcf72 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 23 Apr 2022 14:46:40 +0100 Subject: [PATCH] lvm2: move fix-blkdeactivate.patch to version 2.03.15+ only --- pkgs/os-specific/linux/lvm2/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 53cab49f1a63..4cb86bf3d8b9 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -96,8 +96,9 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE ""|g' ./include/configure.h ''; - patches = [ + patches = lib.optionals (lib.versionAtLeast version "2.03.15") [ # fixes paths to and checks for tools + # TODO: needs backport to LVM 2.02 used by static/musl (substituteAll (let optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw"; in {