slurm: remove obsolete dependencies
libssh and openssl are not required anymore
This commit is contained in:
parent
d245896789
commit
335c487686
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
|
||||
, python, munge, perl, pam, openssl, zlib, shadow, coreutils
|
||||
, python, munge, perl, pam, zlib, shadow, coreutils
|
||||
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
|
||||
, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests
|
||||
, readline, freeipmi, xorg, lz4, rdma-core, nixosTests
|
||||
# enable internal X11 support via libssh2
|
||||
, enableX11 ? true
|
||||
}:
|
||||
|
@ -37,22 +37,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig libtool ];
|
||||
buildInputs = [
|
||||
curl python munge perl pam openssl zlib
|
||||
curl python munge perl pam zlib
|
||||
libmysqlclient ncurses gtk2 lz4 rdma-core
|
||||
lua hwloc numactl readline freeipmi shadow.su
|
||||
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
|
||||
] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ];
|
||||
|
||||
configureFlags = with stdenv.lib;
|
||||
[ "--with-freeipmi=${freeipmi}"
|
||||
"--with-hwloc=${hwloc.dev}"
|
||||
"--with-lz4=${lz4.dev}"
|
||||
"--with-munge=${munge}"
|
||||
"--with-ssl=${openssl.dev}"
|
||||
"--with-zlib=${zlib}"
|
||||
"--with-ofed=${rdma-core}"
|
||||
"--sysconfdir=/etc/slurm"
|
||||
] ++ (optional (gtk2 == null) "--disable-gtktest")
|
||||
++ (optional enableX11 "--with-libssh2=${libssh2.dev}")
|
||||
++ (optional (!enableX11) "--disable-x11");
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue