summary refs log tree commit diff
path: root/pkgs/servers/computing
diff options
context:
space:
mode:
authorLancelot SIX <lancelot@lancelotsix.com>2015-12-19 02:07:09 +0100
committerLancelot SIX <lancelot@lancelotsix.com>2015-12-19 16:50:24 +0100
commit53a3294e956fbb91c884e0dfe43ee749b23334c3 (patch)
tree774378b73e471b057cf0f7c83a31f11734212884 /pkgs/servers/computing
parentb3b7f9f37f8c134aa22b66ec6a0a1d555f1638bb (diff)
downloadnixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.tar
nixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.tar.gz
nixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.tar.bz2
nixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.tar.lz
nixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.tar.xz
nixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.tar.zst
nixpkgs-53a3294e956fbb91c884e0dfe43ee749b23334c3.zip
pkgs.slurm-llnl-full: Add full variant of slurm-llnl
Add a variant of slurm-llnl that includes sview (based on gtk).
pkgs.slurm-llnl also gains the ncurses-based smap tool.
Diffstat (limited to 'pkgs/servers/computing')
-rw-r--r--pkgs/servers/computing/slurm/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 5e55724a290..6df27eaf328 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, python, munge, perl, pam, openssl, mysql }:
-
-#TODO: add sview support based on gtk2
+{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl,
+  ncurses, mysql, gtk }:
 
 stdenv.mkDerivation rec {
   name = "slurm-llnl-${version}";
@@ -11,12 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1";
   };
 
-  buildInputs = [ python munge perl pam openssl mysql.lib ];
+  buildInputs = [ pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk ];
 
-  configureFlags = ''
-    --with-munge=${munge}
-    --with-ssl=${openssl}
-  '';
+  configureFlags =
+    [ "--with-munge=${munge}"
+      "--with-ssl=${openssl}"
+    ] ++ stdenv.lib.optional (gtk == null)  "--disable-gtktest";
 
   preConfigure = ''
     substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}"