diff options
author | oxalica <oxalicc@pm.me> | 2021-02-26 00:21:13 +0800 |
---|---|---|
committer | oxalica <oxalicc@pm.me> | 2021-04-02 19:20:23 +0800 |
commit | 354d262db829ecedb3fb43d1bdb454b20d9941f7 (patch) | |
tree | 86deabdf6369837aafc1b28170fb2a7047edfe1b /pkgs/os-specific | |
parent | 905ecb920edc73922beea028adf3b139f96f3bd6 (diff) | |
download | nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.tar nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.tar.gz nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.tar.bz2 nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.tar.lz nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.tar.xz nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.tar.zst nixpkgs-354d262db829ecedb3fb43d1bdb454b20d9941f7.zip |
lib.meta: introduce `availableOn`
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 935b5e65b1f..e049a8d82ee 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -3,8 +3,8 @@ , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk -, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) perl.meta.platforms, perl -, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) python.meta.platforms, python +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl, perl +, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform python, python , swig , ncurses , pam diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4f757862897..1c02e1f602c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -51,9 +51,9 @@ , iptables , withSelinux ? false , libselinux -, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms +, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp , libseccomp -, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms +, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools , kexectools , bashInteractive , libmicrohttpd |