diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-07-29 23:20:51 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@sap.com> | 2022-08-04 11:54:24 +0200 |
| commit | 4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb (patch) | |
| tree | 8d389951ad7a470360d7ab103cc018d5acbf8852 /pkgs/servers/computing/slurm/default.nix | |
| parent | 0cd42304008cee5503e3cb39d759fe5582c0cb9f (diff) | |
| download | nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.tar nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.tar.gz nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.tar.bz2 nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.tar.lz nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.tar.xz nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.tar.zst nixlib-4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb.zip | |
slurm: remove gtk2 null override
Diffstat (limited to 'pkgs/servers/computing/slurm/default.nix')
| -rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index b64d8b1e442a..b30cde849e0c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, shadow, coreutils, dbus, libbpf -, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl +, ncurses, libmysqlclient, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests , pmix , libjwt @@ -9,6 +9,7 @@ , http-parser # enable internal X11 support via libssh2 , enableX11 ? true +, enableGtk2 ? false, gtk2 }: stdenv.mkDerivation rec { @@ -51,11 +52,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool python3 perl ]; buildInputs = [ curl python3 munge pam - libmysqlclient ncurses gtk2 lz4 rdma-core + libmysqlclient ncurses lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su pmix json_c libjwt libyaml dbus libbpf http-parser - ] ++ lib.optionals enableX11 [ xorg.xauth ]; + ] ++ lib.optionals enableX11 [ xorg.xauth ] + ++ lib.optionals enableGtk2 [ gtk2 ]; configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" "--with-bpf=${libbpf}" - ] ++ (optional (gtk2 == null) "--disable-gtktest") + ] ++ (optional enableGtk2 "--disable-gtktest") ++ (optional (!enableX11) "--disable-x11"); |