pkgs/servers: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob
2021-01-15 14:07:56 +07:00
parent e245ae3c3a
commit 872973d7d1
172 changed files with 454 additions and 455 deletions

View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace src/common/env.c \
--replace "/bin/echo" "${coreutils}/bin/echo"
'' + (stdenv.lib.optionalString enableX11 ''
'' + (lib.optionalString enableX11 ''
substituteInPlace src/common/x11_util.c \
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
'');
@@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi shadow.su
pmix
] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ];
] ++ lib.optionals enableX11 [ xorg.xauth ];
configureFlags = with stdenv.lib;
configureFlags = with lib;
[ "--with-freeipmi=${freeipmi}"
"--with-hwloc=${hwloc.dev}"
"--with-lz4=${lz4.dev}"