diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 20:52:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-04 10:03:53 +0200 |
commit | b44d846990d779f7201f114076a2f2bcacdc91c5 (patch) | |
tree | 9a6f766bfb04765e1095be811aab38b94f88bd5d /pkgs/os-specific/linux/lvm2 | |
parent | ec7a4ddd92e19e0084a07448671cd79d974cd818 (diff) | |
download | nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.gz nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.bz2 nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.lz nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.xz nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.zst nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.zip |
udev: complete rework
- systemd puts all into one output now (except for man), because I wasn't able to fix all systemd/udev refernces for NixOS to work well - libudev is now by default *copied* into another path, which is what most packages will use as build input :-) - pkgs.udev = [ libudev.out libudev.dev ]; because there are too many references that just put `udev` into build inputs (to rewrite them all), also this made "${udev}/foo" fail at *evaluation* time so it's easier to catch and change to something more specific
Diffstat (limited to 'pkgs/os-specific/linux/lvm2')
-rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 2ec7ff5189d..32a8ba4ad46 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: +{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, enable_dmeventd ? false }: let version = "2.02.132"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ udev ]; + buildInputs = [ libudev ]; preConfigure = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation { --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/sbin/lvm $out/sbin/lvm \ - --replace /usr/bin/udevadm ${udev.out}/bin/udevadm + --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in |