summary refs log tree commit diff
path: root/pkgs/servers/computing
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2018-10-06 17:04:04 -0400
committerBenjamin Hipple <bhipple@protonmail.com>2018-10-06 17:04:04 -0400
commit2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279 (patch)
treef60aaad40be303e623989fc367bc1791fd7c513b /pkgs/servers/computing
parent2ed17db8cdeb8e6385f8ac1153e862183813f244 (diff)
downloadnixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.tar
nixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.tar.gz
nixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.tar.bz2
nixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.tar.lz
nixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.tar.xz
nixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.tar.zst
nixpkgs-2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279.zip
Add zlib; swap to lz4.dev
Diffstat (limited to 'pkgs/servers/computing')
-rw-r--r--pkgs/servers/computing/slurm/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index afb39ac9fb3..e016c5860f7 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
-, python, munge, perl, pam, openssl
+, python, munge, perl, pam, openssl, zlib
 , ncurses, mysql, gtk2, lua, hwloc, numactl
 , readline, freeipmi, libssh2, xorg, lz4
 # enable internal X11 support via libssh2
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    curl python munge perl pam openssl
+    curl python munge perl pam openssl zlib
       mysql.connector-c ncurses gtk2 lz4
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
@@ -42,9 +42,10 @@ stdenv.mkDerivation rec {
   configureFlags = with stdenv.lib;
     [ "--with-freeipmi=${freeipmi}"
       "--with-hwloc=${hwloc.dev}"
-      "--with-lz4=${lz4}"
+      "--with-lz4=${lz4.dev}"
       "--with-munge=${munge}"
       "--with-ssl=${openssl.dev}"
+      "--with-zlib=${zlib}"
       "--sysconfdir=/etc/slurm"
     ] ++ (optional (gtk2 == null)  "--disable-gtktest")
       ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");