nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 01:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
gcr: use lib.meta.availableOn instead of isLinux
This commit is contained in:
Weijia Wang 2023-06-12 14:43:34 +03:00 committed by GitHub
commit 04378fc6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gcr/default.nix
View File

@ -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"
];