mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
treewide: Make shouldUsePackages
copypasta use meta.available
The old way depended on old list-of-strings `meta.platforms`, and was not good for cross.
This commit is contained in:
parent
eeb8419c6a
commit
79d8353b5e
@ -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;
|
||||
|
@ -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";
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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";
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user