aboutsummaryrefslogtreecommitdiff
path: root/pkgs/os-specific/linux/apparmor
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-08-29 01:20:43 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-09-28 15:01:00 +0300
commit50d036088802a30934103f320458b151fb96f8b0 (patch)
tree35155cad35cd11dfe43bfb3f85172d3ec66effaf /pkgs/os-specific/linux/apparmor
parentcdeafe7cdf5d6272049f45dc695a9715fad4d414 (diff)
apparmor: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} = true by making them do unpredictable things.
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
-rw-r--r--pkgs/os-specific/linux/apparmor/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 08428f95b06..3ffaef8109f 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch, makeWrapper, autoreconfHook
+{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
, pkgconfig, which
, flex, bison
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, gawk
-, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && perl.meta.available or false, perl
-, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && python.meta.available or false, python
+, 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
, swig
, ncurses
, pam