Unverified Commit 04378fc6 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #237326 from amjoseph-nixpkgs/pr/gcr/systemd-availableOn

gcr: use lib.meta.availableOn instead of isLinux
parents 577db5f1 7c3c8d3d
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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"
  ];