JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47922 from bhipple/u/slurm

Browse Source 
slurm: add lz4 dependency
This commit is contained in:
Jörg Thalheim 2018-10-10 01:12:48 +01:00 committed by GitHub
commit acc2bd15e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/servers/computing/slurm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl , python, munge, perl, pam, openssl, zlib
, ncurses, mysql, gtk2, lua, hwloc, numactl , ncurses, mysql, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg , readline, freeipmi, libssh2, xorg, lz4
# enable internal X11 support via libssh2 # enable internal X11 support via libssh2
, enableX11 ? true , enableX11 ? true
}: }:
@ -34,16 +34,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkgconfig libtool ];
buildInputs = [ buildInputs = [
curl python munge perl pam openssl curl python munge perl pam openssl zlib
mysql.connector-c ncurses gtk2 mysql.connector-c ncurses gtk2 lz4
lua hwloc numactl readline freeipmi lua hwloc numactl readline freeipmi
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
configureFlags = with stdenv.lib; configureFlags = with stdenv.lib;
[ "--with-munge=${munge}" [ "--with-freeipmi=${freeipmi}"
"--with-ssl=${openssl.dev}"
"--with-hwloc=${hwloc.dev}" "--with-hwloc=${hwloc.dev}"
"--with-freeipmi=${freeipmi}" "--with-lz4=${lz4.dev}"
"--with-munge=${munge}"
"--with-ssl=${openssl.dev}"
"--with-zlib=${zlib}"
"--sysconfdir=/etc/slurm" "--sysconfdir=/etc/slurm"
] ++ (optional (gtk2 == null) "--disable-gtktest") ] ++ (optional (gtk2 == null) "--disable-gtktest")
++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");