summary refs log tree commit diff
path: root/pkgs/servers/computing
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@gmail.com>2019-11-05 22:00:23 +0100
committerMarkus Kowalewski <markus.kowalewski@gmail.com>2019-11-10 14:04:54 +0100
commit8219a3b7135f11035884df8196136f69f522bca1 (patch)
treece30e41688728094d3db3cb0b65f887fe54ce36a /pkgs/servers/computing
parent9e733df81faeebdd39fcb7fe8b1e72a6864f0635 (diff)
downloadnixpkgs-8219a3b7135f11035884df8196136f69f522bca1.tar
nixpkgs-8219a3b7135f11035884df8196136f69f522bca1.tar.gz
nixpkgs-8219a3b7135f11035884df8196136f69f522bca1.tar.bz2
nixpkgs-8219a3b7135f11035884df8196136f69f522bca1.tar.lz
nixpkgs-8219a3b7135f11035884df8196136f69f522bca1.tar.xz
nixpkgs-8219a3b7135f11035884df8196136f69f522bca1.tar.zst
nixpkgs-8219a3b7135f11035884df8196136f69f522bca1.zip
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).
Diffstat (limited to 'pkgs/servers/computing')
-rw-r--r--pkgs/servers/computing/slurm/default.nix3
1 files changed, 2 insertions, 1 deletions
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 = ''