diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2019-05-25 15:04:12 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2019-10-13 13:11:55 +0200 |
| commit | 0489025cabc62a6cfa5601abdde2cc32001f9a81 (patch) | |
| tree | 178324714121edbe4f6d7e4827f9bbc268a80a9d /pkgs/os-specific/linux/lvm2 | |
| parent | 494d2deebfc3bde363ca5fe0bb32ddf81a86e62d (diff) | |
| download | nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.tar nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.tar.gz nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.tar.bz2 nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.tar.lz nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.tar.xz nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.tar.zst nixpkgs-0489025cabc62a6cfa5601abdde2cc32001f9a81.zip | |
lvm2: allow building with systemd = null
The closure still picks up systemd via udev, however, overriding with eudev is necessary to avoid the reference.
Diffstat (limited to 'pkgs/os-specific/linux/lvm2')
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index bf5aa88f5bb..d6522e60e9e 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation { preConfigure = '' - substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/bin/udevadm ${systemd}/bin/udevadm - sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + '' + stdenv.lib.optionalString (systemd != null) '' + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/bin/udevadm ${systemd}/bin/udevadm ''; enableParallelBuilding = true; @@ -73,7 +73,7 @@ stdenv.mkDerivation { '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ --replace $out/sbin/blkid ${utillinux}/sbin/blkid - + '' + stdenv.lib.optionalString (systemd != null) '' # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system |