JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apparmor: disable strictDeps explicitly for libapparmor

Browse Source 
do not override python to python3 in all-packages
This commit is contained in:
Artturin 2021-10-23 01:35:22 +03:00
parent d8df341832
commit bef48d172a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -4,7 +4,7 @@
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, gawk
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl, perl
, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform python, python
, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform python3, python3
, swig
, ncurses
, pam
@ -68,6 +68,11 @@ let
name = "libapparmor-${apparmor-version}";
src = apparmor-sources;
# checking whether python bindings are enabled... yes
# checking for python3... no
# configure: error: python is required when enabling python bindings
strictDeps = false;
nativeBuildInputs = [
autoreconfHook
bison
@ -77,11 +82,11 @@ let
ncurses
which
perl
];
] ++ lib.optional withPython python3;
buildInputs = []
++ lib.optional withPerl perl
++ lib.optional withPython python;
++ lib.optional withPython python3;
# required to build apparmor-parser
dontDisableStatic = true;
@ -121,7 +126,7 @@ let
buildInputs = [
perl
python
python3
libapparmor
libapparmor.python
];
@ -143,7 +148,7 @@ let
postInstall = ''
sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d"
for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python3.libPrefix}/site-packages:$PYTHONPATH"
done
substituteInPlace $out/bin/aa-notify \

2
pkgs/top-level/all-packages.nix
View File

@ -21586,7 +21586,7 @@ with pkgs;
iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { };
inherit (callPackages ../os-specific/linux/apparmor { python = python3; })
inherit (callPackages ../os-specific/linux/apparmor { })
libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;