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

Merge pull request #183812 from SuperSandro2000/slurm

Browse Source 
slurm: remove gtk2 null override
This commit is contained in:
markuskowa 2022-08-04 17:39:54 +02:00 committed by GitHub
commit 97f9322789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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");

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

@ -23213,7 +23213,7 @@ with pkgs;
switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { };
slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
slurm = callPackage ../servers/computing/slurm { };
slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { };