nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6897 from joachifm/apparmor-revdeps

Browse Source 
Change uses of apparmor to libapparmor (v2.9)
This commit is contained in:
Arseniy Seroka 2015-03-19 19:53:27 +03:00
commit 48e06786fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/r-modules/default.nix
View File

@ -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: {

4
pkgs/os-specific/linux/lxc/default.nix
View File

@ -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 ];