forked from mirrors/nixpkgs
apparmor: fix build by using older perl
This is work around #5270. Also bogus path in wrapper got fixed. CC: maintainers @phreedom, @thoughtpolice. It would be better to test this as well by someone who actually uses it.
This commit is contained in:
parent
e815624b67
commit
62e5e2a880
|
@ -77,9 +77,13 @@ stdenv.mkDerivation rec {
|
|||
cd ..
|
||||
cp -r kernel-patches $out
|
||||
'';
|
||||
installPhase = ''
|
||||
|
||||
installPhase = let
|
||||
perlVersion = (builtins.parseDrvName perl.name).version;
|
||||
in ''
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/5.10.1/i686-linux-thread-multi/"
|
||||
wrapProgram $i --prefix PERL5LIB : \
|
||||
"$PERL5LIB:$out/lib/perl5/${perlVersion}/${stdenv.system}-thread-multi/"
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
@ -7956,6 +7956,7 @@ let
|
|||
apparmor = callPackage ../os-specific/linux/apparmor {
|
||||
inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
|
||||
bison = bison2;
|
||||
perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared
|
||||
};
|
||||
|
||||
atop = callPackage ../os-specific/linux/atop { };
|
||||
|
|
Loading…
Reference in a new issue