Merge pull request #7233 from joachifm/apparmor-perl

apparmor: perl support
This commit is contained in:
Domen Kožar 2015-04-07 11:54:49 +02:00
commit 46f4e26154
2 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ let
apparmor-sources = fetchurl { apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; sha256 = "08ha7aigl40vm80f742rljcckdpfpw1s8g4yii1ysabcqcj8ffx6";
}; };
prePatchCommon = '' prePatchCommon = ''
@ -54,7 +54,7 @@ let
buildPhase = '' buildPhase = ''
cd ./libraries/libapparmor cd ./libraries/libapparmor
./autogen.sh ./autogen.sh
./configure --prefix="$out" --with-python ./configure --prefix="$out" --with-python --with-perl
make make
''; '';

View File

@ -8747,7 +8747,7 @@ let
perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared
}; };
apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { swig = swig2; };
libapparmor = apparmor_2_9.libapparmor; libapparmor = apparmor_2_9.libapparmor;
apparmor-pam = apparmor_2_9.apparmor-pam; apparmor-pam = apparmor_2_9.apparmor-pam;
apparmor-parser = apparmor_2_9.apparmor-parser; apparmor-parser = apparmor_2_9.apparmor-parser;