From 62e5e2a880ceb29ac6b445252fc62404653cfc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 10 Dec 2014 16:08:48 +0100 Subject: [PATCH] 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. --- pkgs/os-specific/linux/apparmor/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index e1ae7a6d4d4..f68b436bed1 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a9c1e75473..751ccdde3e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };