From 744ab7a50ec849e763c779f31e5716b3eb07bef2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Oct 2024 17:13:35 +0200 Subject: [PATCH] gcr_4: add systemdSupport option Since 7f2a6f17fccf ("xdg-desktop-portal-gtk: Enable all default portals unconditionally"), building gcr_4 is necessary to build xdg-desktop-portal-gtk, but it wasn't possible for systems that can't use systemd. I've called the option "systemdSupport" for consistency with gcr (3)'s equivalent option. --- pkgs/development/libraries/gcr/4.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index dd860d0bc700..b99c5f9eaa49 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -22,6 +22,7 @@ , gnome , python3 , shared-mime-info +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -56,8 +57,9 @@ stdenv.mkDerivation rec { pango libsecret openssh - systemd gtk4 + ] ++ lib.optionals systemdSupport [ + systemd ]; propagatedBuildInputs = [ @@ -74,6 +76,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" + (lib.mesonEnable "systemd" systemdSupport) ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon