From ed480cbff6084073160c243d0ff2a966f37664b8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 20 Sep 2022 03:04:32 -0700 Subject: [PATCH 1/2] qt-6/modules/qtbase: add systemdSupport parameter --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 5bbed5cb51e5d..07070438b94fa 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -23,6 +23,7 @@ , double-conversion , util-linux , systemd +, systemdSupport ? stdenv.isLinux , libb2 , md4c , mtdev @@ -219,7 +220,7 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_openssl_linked=ON" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DQT_FEATURE_sctp=ON" - "-DQT_FEATURE_journald=ON" + "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ # build as a set of dynamic libraries From e665d5c12398a91bc5ee90e852c54552cefcbba5 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 20 Sep 2022 17:49:33 -0700 Subject: [PATCH 2/2] qt-6/modules/qtbase.nix: drop systemd from buildInputs if !systemdSupport --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 07070438b94fa..93801ae51a3f7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -130,7 +130,9 @@ stdenv.mkDerivation rec { unixODBCDrivers.mariadb ] ++ lib.optionals stdenv.isLinux [ util-linux + ] ++ lib.optionals systemdSupport [ systemd + ] ++ [ mtdev lksctp-tools libselinux