diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-08-29 01:20:54 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-09-28 15:01:00 +0300 |
commit | 5e84926a667d496d1c09d00df260299e853cdd03 (patch) | |
tree | 0b611e67e81f49a2a0ac211870823aea699e653c /pkgs/servers/shishi | |
parent | 50d036088802a30934103f320458b151fb96f8b0 (diff) |
treewide: Replace meta.available checks in `shouldUsePackages` copypasta
This reverts commit 79d8353b5e4bb98f1b51ab32b9b26df81bb7e106. This sort of code breaks config.{allowBroken, allowUnsupportedSystem} = true by making them do unpredictable things.
Diffstat (limited to 'pkgs/servers/shishi')
-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 1540a6f1fd18d..b066ff18bfdc8 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; |