diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-02 18:22:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-02 18:22:37 +0200 |
| commit | 6ce04af13736e5a4a60cbb703507381f561bb13c (patch) | |
| tree | 7d1f67eaaf95d67fd9002c05e21932c012facfba /pkgs/servers/shishi/default.nix | |
| parent | 9d5a1ab426d81b3a84d1ec3ff4f22b057f253f02 (diff) | |
| parent | 4d1abc44199c8957105f538119c2d19d67aee26f (diff) | |
| download | nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.tar nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.tar.gz nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.tar.bz2 nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.tar.lz nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.tar.xz nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.tar.zst nixlib-6ce04af13736e5a4a60cbb703507381f561bb13c.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/servers/shishi/default.nix')
| -rw-r--r-- | pkgs/servers/shishi/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 1540a6f1fd18..b066ff18bfdc 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -14,7 +14,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; |