diff options
author | Silvan Mosberger <contact@infinisil.com> | 2021-05-08 03:54:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-08 03:54:36 +0200 |
commit | 08d94fd2b00e5d403e3a5aa80e52c0b940044ebf (patch) | |
tree | 80bd55b90c10bf2783aca010bf9de3b727e41acd /pkgs/os-specific | |
parent | 088da8735f6620b60d724aa7db742607ea216087 (diff) | |
parent | 354d262db829ecedb3fb43d1bdb454b20d9941f7 (diff) | |
download | nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.tar nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.tar.gz nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.tar.bz2 nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.tar.lz nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.tar.xz nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.tar.zst nixpkgs-08d94fd2b00e5d403e3a5aa80e52c0b940044ebf.zip |
Merge pull request #114374 from oxalica/lib/platform-support-check
lib.meta: introduce `availableOn` to check package availability on given platform
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 bb0c0b45d6e..1845d4a9c2b 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 bd7c646c920..7302b363ecf 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 |