From fa843cdf11cb2e6f35871f7b67456e62d59b00c0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 17 Mar 2015 18:04:16 +0100
Subject: [PATCH 1/2] lxc: use AppArmor 2.9

---
 pkgs/os-specific/linux/lxc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 04ca4514a0f..97f80b53032 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchurl, libcap, apparmor, perl, docbook2x
+{ stdenv, autoreconfHook, fetchurl, libcap, libapparmor, perl, docbook2x
 , docbook_xml_dtd_45, gnutls, pkgconfig
 }:
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0";
   };
 
-  buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
+  buildInputs = [ libcap libapparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
 
   patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ];
 

From 0e52c562b5f37d2dc1a0e62701c59ec333e9d32f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 19 Mar 2015 14:14:28 +0100
Subject: [PATCH 2/2] RAppArmor: use AppArmor 2.9

---
 pkgs/development/r-modules/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f905459d648..9aa6af66ccf 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -256,7 +256,7 @@ let
     qtpaint = [ pkgs.qt4 ];
     R2GUESS = [ pkgs.gsl ];
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
-    RAppArmor = [ pkgs.apparmor ];
+    RAppArmor = [ pkgs.libapparmor ];
     rbamtools = [ pkgs.zlib ];
     RCA = [ pkgs.gmp ];
     rcdd = [ pkgs.gmp ];
@@ -1003,7 +1003,7 @@ let
 
     RAppArmor = old.RAppArmor.overrideDerivation (attrs: {
       patches = [ ./patches/RAppArmor.patch ];
-      LIBAPPARMOR_HOME = "${pkgs.apparmor}";
+      LIBAPPARMOR_HOME = "${pkgs.libapparmor}";
     });
 
     RMySQL = old.RMySQL.overrideDerivation (attrs: {