From 8219a3b7135f11035884df8196136f69f522bca1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Nov 2019 22:00:23 +0100 Subject: nixos/slurm: fix X11 with spank module * Fix path in module for slurm to find plugstack.conf * Fix configure flags so that slurm can be compiled without internal X11 support (required for spank-x11). --- pkgs/servers/computing/slurm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/servers/computing') diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 916c681ab16..e0c7e635d6c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") - ++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); + ++ (optional enableX11 "--with-libssh2=${libssh2.dev}") + ++ (optional (!enableX11) "--disable-x11"); preConfigure = '' -- cgit 1.4.1