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/misc/jackaudio | |
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/misc/jackaudio')
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/jack1.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 391ac107ab71..efd5aa4e9194 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let inherit (python2Packages) python dbus-python; - 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; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index c11be4ad0c0c..2e349cf691c9 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - 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; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; |