From 38dc021b168539f50630b46630d27f8cd2ea30ef Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 Apr 2015 10:21:40 +0200 Subject: [PATCH 1/2] apparmor: use base32 digest --- pkgs/os-specific/linux/apparmor/2.9/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix index 788297ba339..a5b692e6a6c 100644 --- a/pkgs/os-specific/linux/apparmor/2.9/default.nix +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -17,7 +17,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; + sha256 = "08ha7aigl40vm80f742rljcckdpfpw1s8g4yii1ysabcqcj8ffx6"; }; prePatchCommon = '' From d3ea6abf0ee2740bc71b86c5e07e2cd7b6223283 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 Apr 2015 10:58:08 +0200 Subject: [PATCH 2/2] libapparmor: build perl bindings There are still a few utils which use Perl, though most have been ported to Python. Note that SWIG v2 is required to avoid the `error: 'bool' undeclared` build failure with Perl >=5.16 [1]. [1]: https://github.com/swig/swig/commit/4305a3cef9b210541c3b88ab2fd03d787c3bca66 --- pkgs/os-specific/linux/apparmor/2.9/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix index a5b692e6a6c..0243c2aa456 100644 --- a/pkgs/os-specific/linux/apparmor/2.9/default.nix +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -54,7 +54,7 @@ let buildPhase = '' cd ./libraries/libapparmor ./autogen.sh - ./configure --prefix="$out" --with-python + ./configure --prefix="$out" --with-python --with-perl make ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab11bf12bb0..6e708f20407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8676,7 +8676,7 @@ let 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; apparmor-pam = apparmor_2_9.apparmor-pam; apparmor-parser = apparmor_2_9.apparmor-parser;