summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-03-09 17:58:36 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-03-12 18:55:41 -0400
commit79d8353b5e4bb98f1b51ab32b9b26df81bb7e106 (patch)
treef19c8d4068da9cb061983271bf2f8c2b2dc2f8f7 /pkgs
parenteeb8419c6a358a7b8d5a8fa9fc3d0352337196f7 (diff)
downloadnixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.tar
nixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.tar.gz
nixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.tar.bz2
nixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.tar.lz
nixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.tar.xz
nixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.tar.zst
nixpkgs-79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.zip
treewide: Make `shouldUsePackages` copypasta use meta.available
The old way depended on old list-of-strings `meta.platforms`, and was
not good for cross.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/wiredtiger/default.nix2
-rw-r--r--pkgs/misc/jackaudio/default.nix2
-rw-r--r--pkgs/misc/jackaudio/jack1.nix2
-rw-r--r--pkgs/os-specific/linux/ffado/default.nix2
-rw-r--r--pkgs/servers/shishi/default.nix2
-rw-r--r--pkgs/tools/filesystems/ceph/generic.nix3
6 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 9d11b98b1cb..c905c40cf96 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -15,7 +15,7 @@ let
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a242f0261c7..0ed0246a881 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -15,7 +15,7 @@
 with stdenv.lib;
 let
   inherit (python2Packages) python dbus-python;
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   libOnly = prefix == "lib";
 
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 28ce85bd8a3..43d23dd525a 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optAlsaLib = shouldUsePkg alsaLib;
   optDb = shouldUsePkg db;
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 4e2d2b38841..4e3e373d244 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -11,7 +11,7 @@
 
 let
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   libOnly = prefix == "lib";
 
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 535571f46e2..1540a6f1fd1 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 && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 32b85eaa681..3d35a10f3b3 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -37,8 +37,7 @@ with stdenv.lib;
 let
 
   shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value;
-    in if lib.any (x: x == system) (pkg.meta.platforms or [])
-      then pkg else null;
+    in if pkg.meta.available or false then pkg else null;
 
   optYasm = shouldUsePkg yasm;
   optFcgi = shouldUsePkg fcgi;