From 5e84926a667d496d1c09d00df260299e853cdd03 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 29 Aug 2018 01:20:54 +0300 Subject: 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. --- pkgs/servers/shishi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers/shishi') diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 1540a6f1fd1..b066ff18bfd 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; -- cgit 1.4.1