From 53a3294e956fbb91c884e0dfe43ee749b23334c3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 19 Dec 2015 02:07:09 +0100 Subject: 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. --- pkgs/servers/computing/slurm/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'pkgs/servers/computing') 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}" -- cgit 1.4.1