diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-01 02:06:41 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-01 02:06:41 +0400 |
| commit | d9b13c1eb1b6834461c43f378c0b9ba9318c0225 (patch) | |
| tree | ac70b636500c890252eb3af0afcfb6e9f22ed146 /pkgs | |
| parent | 622bdca26c55872ef8870ff3316360fade96f056 (diff) | |
| download | nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.tar nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.tar.gz nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.tar.bz2 nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.tar.lz nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.tar.xz nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.tar.zst nixpkgs-d9b13c1eb1b6834461c43f378c0b9ba9318c0225.zip | |
Make dmeventd support in lvm2 optional; use it for dmraid
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 739b47bf91d..ee6165bfc9a 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 }: +{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let version = "2.02.110"; @@ -13,7 +13,9 @@ stdenv.mkDerivation { }; configureFlags = - "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-dmeventd --enable-cmdlib"; + "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib" + + (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd") + ; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0b12a1e24f..cfc93a8cf45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7259,7 +7259,9 @@ let inherit (xlibs) xproto; }; - dmraid = callPackage ../os-specific/linux/dmraid { }; + dmraid = callPackage ../os-specific/linux/dmraid { + devicemapper = devicemapper.override {enable_dmeventd = true;}; + }; drbd = callPackage ../os-specific/linux/drbd { }; |