diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 21:45:37 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-17 23:26:08 +0700 |
| commit | 16d91ee628d781c721506b19e3e03bed810327e8 (patch) | |
| tree | f65e50a70b4ff72314f384c6b29f4902b03f45f3 /pkgs/os-specific/linux/lvm2 | |
| parent | 979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff) | |
| download | nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.gz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.bz2 nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.lz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.xz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.zst nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.zip | |
pkgs/os-specific: stdenv.lib -> lib
Diffstat (limited to 'pkgs/os-specific/linux/lvm2')
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a7666cc6a7f..65048ab4bd5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -15,7 +15,7 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; + pname = "lvm2" + lib.optionalString enableDmeventd "with-dmeventd"; version = "2.03.10"; src = fetchurl { @@ -32,20 +32,20 @@ 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 (!enableCmdlib) [ + ] ++ lib.optionals (!enableCmdlib) [ "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" "--libdir=${placeholder "lib"}/lib" - ] ++ stdenv.lib.optional enableCmdlib "--enable-cmdlib" - ++ stdenv.lib.optionals enableDmeventd [ + ] ++ lib.optional enableCmdlib "--enable-cmdlib" + ++ lib.optionals enableDmeventd [ "--enable-dmeventd" "--with-dmeventd-pidfile=/run/dmeventd/pid" "--with-default-dm-run-dir=/run/dmeventd" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ] ++ - stdenv.lib.optionals (udev != null) [ + lib.optionals (udev != null) [ "--enable-udev_rules" "--enable-udev_sync" ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root - makeFlags = stdenv.lib.optionals (udev != null) [ + makeFlags = lib.optionals (udev != null) [ "SYSTEMD_GENERATOR_DIR=$(out)/lib/systemd/system-generators" ]; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; # Install systemd stuff. - installTargets = [ "install" ] ++ stdenv.lib.optionals (udev != null) [ + installTargets = [ "install" ] ++ lib.optionals (udev != null) [ "install_systemd_generators" "install_systemd_units" "install_tmpfiles_configuration" @@ -107,12 +107,12 @@ stdenv.mkDerivation rec { "out" "dev" "man" - ] ++ stdenv.lib.optionals (enableCmdlib != true) [ + ] ++ lib.optionals (enableCmdlib != true) [ "bin" "lib" ]; - postInstall = stdenv.lib.optionalString (enableCmdlib != true) '' + postInstall = lib.optionalString (enableCmdlib != true) '' moveToOutput lib/libdevmapper.so $lib ''; |