diff options
| author | Florian Klink <flokli@flokli.de> | 2020-07-14 11:19:43 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-07-14 12:00:33 +0200 |
| commit | 12d32eefede3f5b5becbb87c6c69bfe1d82cd79d (patch) | |
| tree | 656acdada4825f75eb44fb827dacedeafac1e01e /pkgs/os-specific/linux/lvm2 | |
| parent | 53a34361afe7b58db95c77cd99f268fd933e4053 (diff) | |
| download | nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.tar nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.tar.gz nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.tar.bz2 nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.tar.lz nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.tar.xz nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.tar.zst nixpkgs-12d32eefede3f5b5becbb87c6c69bfe1d82cd79d.zip | |
lvm2: rename enable_{cmdlib,dmeventd} to enable{Cmdlib,Dmeventd}
Make this more consistent with how these flags look like in the rest of nixpkgs.
Diffstat (limited to 'pkgs/os-specific/linux/lvm2')
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 35624f421fa..a6db883cc2c 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -5,16 +5,16 @@ , utillinux , libuuid , thin-provisioning-tools, libaio -, enable_cmdlib ? false -, enable_dmeventd ? false +, enableCmdlib ? false +, enableDmeventd ? false , udev ? null }: # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well -assert enable_dmeventd -> enable_cmdlib; +assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + stdenv.lib.optionalString enable_dmeventd "with-dmeventd"; + pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; version = "2.03.09"; src = fetchurl { @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { "--with-default-locking-dir=/run/lock/lvm" "--with-default-run-dir=/run/lvm" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - ] ++ stdenv.lib.optionals (!enable_cmdlib) [ + ] ++ stdenv.lib.optionals (!enableCmdlib) [ "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" "--libdir=${placeholder "lib"}/lib" - ] ++ stdenv.lib.optional enable_cmdlib "--enable-cmdlib" - ++ stdenv.lib.optionals enable_dmeventd [ + ] ++ stdenv.lib.optional enableCmdlib "--enable-cmdlib" + ++ stdenv.lib.optionals enableDmeventd [ "--enable-dmeventd" "--with-dmeventd-pidfile=/run/dmeventd/pid" "--with-default-dm-run-dir=/run/dmeventd" @@ -106,12 +106,12 @@ stdenv.mkDerivation rec { "out" "dev" "man" - ] ++ stdenv.lib.optionals (enable_cmdlib != true) [ + ] ++ stdenv.lib.optionals (enableCmdlib != true) [ "bin" "lib" ]; - postInstall = stdenv.lib.optionalString (enable_cmdlib != true) '' + postInstall = stdenv.lib.optionalString (enableCmdlib != true) '' moveToOutput lib/libdevmapper.so $lib ''; |