From 7c3c8d3d94cc9182eb8002de02e2f2c4349236a5 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 12 Jun 2023 02:59:31 -0700 Subject: [PATCH] gcr: use lib.meta.availableOn instead of isLinux This commit uses `lib.meta.availableOn hostPlatform systemd` (instead of `hostPlatform.isLinux`) to decide whether or not to depend on systemd. --- pkgs/development/libraries/gcr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 7c20e2f5c6d..0f03e9184e1 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -14,7 +14,7 @@ , pango , libsecret , openssh -, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , gobject-introspection , wrapGAppsHook , gi-docgen @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pango libsecret openssh - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (systemdSupport) [ systemd ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!systemdSupport) [ "-Dsystemd=disabled" ];