From 250e410a922368f47ceb0f706b667dff40b9b4b9 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:06:36 +0000 Subject: [PATCH] qt-6/modules/qtbase: add systemdSupport parameter (#192057) --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 5bbed5cb51e5d14..93801ae51a3f787 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 @@ -129,7 +130,9 @@ stdenv.mkDerivation rec { unixODBCDrivers.mariadb ] ++ lib.optionals stdenv.isLinux [ util-linux + ] ++ lib.optionals systemdSupport [ systemd + ] ++ [ mtdev lksctp-tools libselinux @@ -219,7 +222,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