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

Merge pull request #11820 from lancelotsix/build_sview_with_slurm 

pkgs.slurm-llnl-full: Add full variant of slurm-llnl
This commit is contained in:
Arseniy Seroka 2015-12-19 19:29:25 +03:00
parent 05d08e400c 53a3294e95
commit 6f4850fbe7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
{ stdenv, fetchurl, python, munge, perl, pam, openssl, mysql }: { stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl,
ncurses, mysql, gtk }:
#TODO: add sview support based on gtk2
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slurm-llnl-${version}"; name = "slurm-llnl-${version}";
@ -11,12 +10,12 @@ stdenv.mkDerivation rec {
sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1";
}; };
buildInputs = [ python munge perl pam openssl mysql.lib ]; buildInputs = [ pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk ];
configureFlags = '' configureFlags =
--with-munge=${munge} [ "--with-munge=${munge}"
--with-ssl=${openssl} "--with-ssl=${openssl}"
''; ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest";
preConfigure = '' preConfigure = ''
substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}"

4
pkgs/top-level/all-packages.nix
View File

@ -9556,7 +9556,9 @@ let
storm = callPackage ../servers/computing/storm { }; storm = callPackage ../servers/computing/storm { };
slurm-llnl = callPackage ../servers/computing/slurm { }; slurm-llnl = callPackage ../servers/computing/slurm { gtk = null; };
slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { });
tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };