From 43f8a58df85d22c80016c6243115baf90f44ff1c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 20 Feb 2022 12:32:31 -0800 Subject: [PATCH] webkitgtk: honor systemdSupport This commit exposes support for compilation without systemd, controlled by the global systemdSupport argument. This argument is understood by many other nixpkgs expressions and can be set globally in ~/.config/nixpkgs/config.nix. --- pkgs/development/libraries/webkitgtk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 92405b35de2..afa8c63490a 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -60,6 +60,7 @@ , addOpenGLRunpath , enableGeoLocation ? true , withLibsecret ? true +, systemdSupport ? stdenv.isLinux }: stdenv.mkDerivation rec { @@ -158,9 +159,10 @@ stdenv.mkDerivation rec { bubblewrap libseccomp libmanette - systemd wayland xdg-dbus-proxy + ] ++ lib.optionals systemdSupport [ + systemd ] ++ lib.optionals enableGeoLocation [ geoclue2 ] ++ lib.optionals withLibsecret [ @@ -193,7 +195,7 @@ stdenv.mkDerivation rec { "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!systemdSupport) [ "-DUSE_SYSTEMD=OFF" ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ "-DENABLE_GLES2=ON"