summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2022-01-09 01:59:29 +0100
committerGitHub <noreply@github.com>2022-01-08 19:59:29 -0500
commitfb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be (patch)
tree8ea641bef890d03d99849f415e9fba7ad6bcafcd
parentc33156dc0352d0270954f1d9c62166c2e035bb16 (diff)
downloadnixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.tar
nixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.tar.gz
nixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.tar.bz2
nixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.tar.lz
nixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.tar.xz
nixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.tar.zst
nixpkgs-fb69d7668fc2a1259e9ee8e434d79f9b3dd6d3be.zip
lvm2-2_02: fix build (#154041)
2cc29125a722d913a80aaf94c51bdd72219aac07 updated this without taking
account for the older version of the package still around.
-rw-r--r--pkgs/os-specific/linux/lvm2/common.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index 5ee368c242f..0749292531b 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -66,9 +66,13 @@ stdenv.mkDerivation rec {
     substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
       --replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm
     # https://github.com/lvmteam/lvm2/issues/36
+  '' + lib.optionalString (lib.versionOlder version "2.03.14") ''
+    substituteInPlace udev/69-dm-lvm-metad.rules.in \
+      --replace "(BINDIR)/systemd-run" /run/current-system/systemd/bin/systemd-run
+  '' + lib.optionalString (lib.versionAtLeast version "2.03.14") ''
     substituteInPlace udev/69-dm-lvm.rules.in \
       --replace "/usr/bin/systemd-run" /run/current-system/systemd/bin/systemd-run
-
+  '' + ''
     substituteInPlace make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system"
   '' + lib.optionalString (lib.versionAtLeast version "2.03") ''
     substituteInPlace libdm/make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system"