Skip to content

Commit ce8e2c9

Browse files
LordGrimmauldalyssais
authored andcommitted
apparmor: fix cross for different bit depths between build and host
Fixes #405780 Void also does not attempt to enable python on cross for armv7 [1]. This means apparmor-parser will never work on cross. [1] https://github.com/void-linux/void-packages/blob/f8130e11caa853e434dc0ecdfb229d8fcd29c7de/srcpkgs/apparmor/template#L32-L36
1 parent b654ff5 commit ce8e2c9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pkgs/by-name/li/libapparmor/package.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl,
1313
perl,
1414
withPython ?
15-
!stdenv.hostPlatform.isStatic && lib.meta.availableOn stdenv.hostPlatform python3Packages.python,
15+
# static can't load python libraries
16+
!stdenv.hostPlatform.isStatic
17+
&& lib.meta.availableOn stdenv.hostPlatform python3Packages.python
18+
# m4 python include script fails if cpu bit depth is different across machines
19+
&& stdenv.hostPlatform.parsed.cpu.bits == stdenv.buildPlatform.parsed.cpu.bits,
1620
python3Packages,
1721
swig,
1822
ncurses,

0 commit comments

Comments
 (0)