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

apparmor: fix build by using older perl

Browse Source 
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:
Vladimír Čunát 2014-12-10 16:08:48 +01:00
parent e815624b67
commit 62e5e2a880
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,9 +77,13 @@ stdenv.mkDerivation rec {
cd .. cd ..
cp -r kernel-patches $out cp -r kernel-patches $out
''; '';
installPhase = ''
installPhase = let
perlVersion = (builtins.parseDrvName perl.name).version;
in ''
for i in $out/bin/*; do 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 done
''; '';

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

@ -7956,6 +7956,7 @@ let
apparmor = callPackage ../os-specific/linux/apparmor { apparmor = callPackage ../os-specific/linux/apparmor {
inherit (perlPackages) LocaleGettext TermReadKey RpcXML; inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
bison = bison2; bison = bison2;
perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared
}; };
atop = callPackage ../os-specific/linux/atop { }; atop = callPackage ../os-specific/linux/atop { };