diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-12 14:43:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-12 14:43:34 +0300 |
| commit | 04378fc6b1039b8b24acdcae954ade8bbea18917 (patch) | |
| tree | d101fda3d04369785093519c80a3813760541405 /pkgs | |
| parent | 577db5f1bd2c7ff8f4a815b37cc0eee3a49e25e8 (diff) | |
| parent | 7c3c8d3d94cc9182eb8002de02e2f2c4349236a5 (diff) | |
| download | nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.tar nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.tar.gz nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.tar.bz2 nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.tar.lz nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.tar.xz nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.tar.zst nixlib-04378fc6b1039b8b24acdcae954ade8bbea18917.zip | |
Merge pull request #237326 from amjoseph-nixpkgs/pr/gcr/systemd-availableOn
gcr: use lib.meta.availableOn instead of isLinux
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gcr/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 7c20e2f5c6d2..0f03e9184e19 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" ]; |