From 4f2dd9e0ab47b7571b0c161e2fb3b5446a3d0abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 29 Jul 2022 23:20:51 +0200
Subject: [PATCH] slurm: remove gtk2 null override

---
 pkgs/servers/computing/slurm/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 7 insertions(+), 5 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");
 
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a978d6810c52..ca324eed43e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23179,7 +23179,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 { };